mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
commit
bb34222087
1 changed files with 11 additions and 8 deletions
|
@ -11,6 +11,7 @@
|
|||
# executing mysqld_safe
|
||||
|
||||
KILL_MYSQLD=1;
|
||||
MYSQLD=
|
||||
|
||||
trap '' 1 2 3 15 # we shouldn't let anyone kill us
|
||||
|
||||
|
@ -174,14 +175,6 @@ export MYSQL_HOME
|
|||
user=@MYSQLD_USER@
|
||||
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
|
||||
pid_file=
|
||||
err_log=
|
||||
|
@ -220,6 +213,16 @@ then
|
|||
chown $user $mysql_unix_port_dir
|
||||
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
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue