diff options
| author | unknown <jimw@mysql.com> | 2005-11-01 09:38:41 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-01 09:38:41 -0800 |
| commit | 75c45caf2e8831e0129f2726ac5f911442b5790e (patch) | |
| tree | c0b9a4073caecad40cf27ac2066bc9cd2b9f3a97 /scripts/mysqld_safe.sh | |
| parent | fc0769619f98f93469e07ee94e61972db8b1d3ab (diff) | |
| parent | ff546eed4b032cbdb4f6f18fd2b9160392674454 (diff) | |
| download | mariadb-git-75c45caf2e8831e0129f2726ac5f911442b5790e.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-13774
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -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 d6585f4a552..6ce4c1e0da8 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 @@ -130,14 +131,6 @@ fi 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= @@ -176,6 +169,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 |