bk commit into 5.1 tree (tsmith:1.2547) BUG#29634

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-09 16:10:43-06:00, tsmith@stripped +1 -0
  Bug #29634: mysqld_safe does not set err_log variable, error log file is not created
  
  Dont touch & chmod the err_log file if using syslog (mysqld_safe)

  scripts/mysqld_safe.sh@stripped, 2007-07-09 16:09:19-06:00, tsmith@stripped +19 -16
    Dont touch & chmod the err_log file if using syslog

diff -Nrup a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
--- a/scripts/mysqld_safe.sh	2007-07-09 15:30:01 -06:00
+++ b/scripts/mysqld_safe.sh	2007-07-09 16:09:19 -06:00
@@ -289,6 +289,25 @@ then
   syslog=0
 fi
 
+USER_OPTION=""
+if test -w / -o "$USER" = "root"
+then
+  if test "$user" != "root" -o $SET_USER = 1
+  then
+    USER_OPTION="--user=$user"
+  fi
+  # Change the err log to the right user, if it is in use
+  if [ $syslog -eq 0 ]; then
+    touch $err_log
+    chown $user $err_log
+  fi
+  if test -n "$open_files"
+  then
+    ulimit -n $open_files
+    append_arg_to_args "--open-files-limit=$open_files"
+  fi
+fi
+
 safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
 # Make sure that directory for $safe_mysql_unix_port exists
 mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
@@ -385,22 +404,6 @@ else
         # nohup doesn't work on this system
         NOHUP_NICENESS=""
     fi
-fi
-
-USER_OPTION=""
-if test -w / -o "$USER" = "root"
-then
-  if test "$user" != "root" -o $SET_USER = 1
-  then
-    USER_OPTION="--user=$user"
-  fi
-  # If we are root, change the err log to the right user.
-  touch $err_log; chown $user $err_log
-  if test -n "$open_files"
-  then
-    ulimit -n $open_files
-    append_arg_to_args "--open-files-limit=$open_files"
-  fi
 fi
 
 # Try to set the core file size (even if we aren't root) because many systems