4133 Nirbhay Choubey 2012-12-27 [merge]
Merge of patch for Bug#16046140 from mysql-5.1.
modified:
scripts/mysqld_safe.sh
4132 Mattias Jonsson 2012-12-27 [merge]
merge
modified:
sql/ha_partition.cc
sql/sql_table.cc
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh 2012-10-17 06:36:40 +0000
+++ b/scripts/mysqld_safe.sh 2012-12-27 12:06:11 +0000
@@ -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
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5 branch (nirbhay.choubey:4132 to 4133) Bug#16046140 | Nirbhay Choubey | 10 Jan 2013 |
