summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@oracle.com>2012-12-27 17:36:11 +0530
committerNirbhay Choubey <nirbhay.choubey@oracle.com>2012-12-27 17:36:11 +0530
commit519daab67acd07de18b7eb2b8a06250f63d35a2d (patch)
tree54623597d56ca893ed031bde9503acf304254316 /scripts
parent544f413df9c38a0ea28df0037728bd3e264f721a (diff)
parent825459b8cda4f97a3ef1f3affb4889d7807a0f3a (diff)
downloadmariadb-git-519daab67acd07de18b7eb2b8a06250f63d35a2d.tar.gz
Merge of patch for Bug#16046140 from mysql-5.1.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index b5262bf3b13..6587a153a3f 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -569,7 +569,7 @@ then
log_notice "Logging to '$err_log'."
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,
chmod "$fmode" "$err_log" # fix the permissions here!
fi
@@ -785,7 +785,7 @@ do
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
chown $user "$err_log" # flushed yet. we'd recreate it with
chmod "$fmode" "$err_log" # wrong owner next time we log, so set