diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-24 14:22:54 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-24 14:22:54 +0300 |
| commit | 51e8a23ac55e04e9a74d9b5c2d69fa1d4ebc4ab3 (patch) | |
| tree | 4dc9cb32cbebcea2819fbf6bec1a7c2a03f86209 | |
| parent | 382a4c039485612360ec6df4cb5bd68fe541539f (diff) | |
| download | mariadb-git-51e8a23ac55e04e9a74d9b5c2d69fa1d4ebc4ab3.tar.gz | |
Move the pid file testing after arguments are parsed (previous patch was not correct)
| -rw-r--r-- | support-files/mysql.server.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 89d45e0f26d..36eb5c4dff6 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -109,19 +109,6 @@ else fi # -# Set pid file if not given -# -if test -z "$pid_file" -then - pid_file=$datadir/`@HOSTNAME@`.pid -else - case "$pid_file" in - /* ) ;; - * ) pid_file="$datadir/$pid_file" ;; - esac -fi - -# # Test if someone changed datadir; In this case we should also read the # default arguments from this directory # @@ -134,6 +121,19 @@ fi parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server` +# +# Set pid file if not given +# +if test -z "$pid_file" +then + pid_file=$datadir/`@HOSTNAME@`.pid +else + case "$pid_file" in + /* ) ;; + * ) pid_file="$datadir/$pid_file" ;; + esac +fi + # Safeguard (relative paths, core dumps..) cd $basedir |