diff options
| author | monty@narttu.mysql.fi <> | 2003-09-29 12:31:35 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-09-29 12:31:35 +0300 |
| commit | 89f30200bca2fe2861401d0acf9d45320bf9592a (patch) | |
| tree | 0646d11c5212e91d6db4f7118acf7d5183cf88c9 /support-files/mysql.server.sh | |
| parent | 9d7014c07be2511194bed4f948aa67200cda40da (diff) | |
| download | mariadb-git-89f30200bca2fe2861401d0acf9d45320bf9592a.tar.gz | |
Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index fe1f0de8477..89d45e0f26d 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -57,16 +57,6 @@ fi PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin export PATH -if test -z "$pid_file" -then - pid_file=$datadir/`@HOSTNAME@`.pid -else - case "$pid_file" in - /* ) ;; - * ) pid_file="$datadir/$pid_file" ;; - esac -fi - mode=$1 # start or stop parse_arguments() { @@ -119,6 +109,19 @@ 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 # |