diff options
| author | jimw@mysql.com <> | 2005-11-01 12:15:08 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-11-01 12:15:08 -0800 |
| commit | bb34222087f63627a23d9f6d7c27f62fefd93354 (patch) | |
| tree | 1cd68ec46bce0713c48d131d3863f1a4ebb4ac8b /scripts | |
| parent | 198ead8f4ea8e3538e88be498eeac49d83a91bbf (diff) | |
| parent | d012c49ebf18a692af226d15c6730c6d2429a3d6 (diff) | |
| download | mariadb-git-bb34222087f63627a23d9f6d7c27f62fefd93354.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 873aff251db..a584c384712 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -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 |