Commit 5693662f authored by lenz@mysql.com's avatar lenz@mysql.com

- fixed early removing of socket file when multiple instances of mysqld are

   started via mysqld_safe (BUG#2114) Thanks to Rodrigo Marchant for the
   suggestion
parent e452d990
...@@ -115,7 +115,6 @@ else ...@@ -115,7 +115,6 @@ else
ledir=@libexecdir@ ledir=@libexecdir@
fi fi
safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
user=@MYSQLD_USER@ user=@MYSQLD_USER@
niceness=0 niceness=0
...@@ -155,6 +154,7 @@ then ...@@ -155,6 +154,7 @@ then
fi fi
parse_arguments `$print_defaults --loose-verbose $defaults mysqld_safe safe_mysqld` parse_arguments `$print_defaults --loose-verbose $defaults mysqld_safe safe_mysqld`
parse_arguments PICK-ARGS-FROM-ARGV "$@" parse_arguments PICK-ARGS-FROM-ARGV "$@"
safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
if test ! -x $ledir/$MYSQLD if test ! -x $ledir/$MYSQLD
then then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment