Merge of patch for Bug#16046140 from mysql-5.1.
This commit is contained in:
commit
4c03dd7e3a
@ -569,7 +569,7 @@ then
|
|||||||
log_notice "Logging to '$err_log'."
|
log_notice "Logging to '$err_log'."
|
||||||
logging=file
|
logging=file
|
||||||
|
|
||||||
if [ ! -e "$err_log" ]; then # if error log already exists,
|
if [ ! -f "$err_log" ]; then # if error log already exists,
|
||||||
touch "$err_log" # we just append. otherwise,
|
touch "$err_log" # we just append. otherwise,
|
||||||
chmod "$fmode" "$err_log" # fix the permissions here!
|
chmod "$fmode" "$err_log" # fix the permissions here!
|
||||||
fi
|
fi
|
||||||
@ -785,7 +785,7 @@ do
|
|||||||
|
|
||||||
eval_log_error "$cmd"
|
eval_log_error "$cmd"
|
||||||
|
|
||||||
if [ $want_syslog -eq 0 -a ! -e "$err_log" ]; then
|
if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then
|
||||||
touch "$err_log" # hypothetical: log was renamed but not
|
touch "$err_log" # hypothetical: log was renamed but not
|
||||||
chown $user "$err_log" # flushed yet. we'd recreate it with
|
chown $user "$err_log" # flushed yet. we'd recreate it with
|
||||||
chmod "$fmode" "$err_log" # wrong owner next time we log, so set
|
chmod "$fmode" "$err_log" # wrong owner next time we log, so set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user