Commit bb342220 authored by jimw@mysql.com's avatar jimw@mysql.com

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean
parents 198ead8f d012c49e
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
# executing mysqld_safe # executing mysqld_safe
KILL_MYSQLD=1; KILL_MYSQLD=1;
MYSQLD=
trap '' 1 2 3 15 # we shouldn't let anyone kill us trap '' 1 2 3 15 # we shouldn't let anyone kill us
...@@ -174,14 +175,6 @@ export MYSQL_HOME ...@@ -174,14 +175,6 @@ export MYSQL_HOME
user=@MYSQLD_USER@ user=@MYSQLD_USER@
niceness=0 niceness=0
# Use the mysqld-max binary by default if the user doesn't specify a binary
if test -x $ledir/mysqld-max
then
MYSQLD=mysqld-max
else
MYSQLD=mysqld
fi
# these rely on $DATADIR by default, so we'll set them later on # these rely on $DATADIR by default, so we'll set them later on
pid_file= pid_file=
err_log= err_log=
...@@ -220,6 +213,16 @@ then ...@@ -220,6 +213,16 @@ then
chown $user $mysql_unix_port_dir chown $user $mysql_unix_port_dir
fi fi
# Use the mysqld-max binary by default if the user doesn't specify a binary
if test -z "$MYSQLD"
then
if test -x $ledir/mysqld-max
then
MYSQLD=mysqld-max
else
MYSQLD=mysqld
fi
fi
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