diff options
| author | monty@narttu.mysql.fi <> | 2003-11-04 09:40:36 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-11-04 09:40:36 +0200 |
| commit | 4e4725377d27ff0101788fd7ed89670614ed8294 (patch) | |
| tree | d387df22d5d3ffed50ecd8620f1eb18bc61ead7e /support-files | |
| parent | 30af2d0f49a203ae4fb97194e899fa5e13a42c1d (diff) | |
| parent | e1e82a4e00dd2cee2ff56accdd3fdbd5afeadb6a (diff) | |
| download | mariadb-git-4e4725377d27ff0101788fd7ed89670614ed8294.tar.gz | |
Merge with 4.0
Diffstat (limited to 'support-files')
| -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 dec77a15dc5..30ee4ab545f 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 server 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 |