diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-09-29 12:31:35 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-09-29 12:31:35 +0300 |
| commit | e03265d4d585a86b132c6119cb6363839c2f6e5b (patch) | |
| tree | 0646d11c5212e91d6db4f7118acf7d5183cf88c9 /support-files/mysql.server.sh | |
| parent | 3106e3119a2b3ee9155360279e48093d0e3b7d45 (diff) | |
| download | mariadb-git-e03265d4d585a86b132c6119cb6363839c2f6e5b.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
BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b:
Delete: mysql-test/r/ins000001.result
BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
Delete: mysql-test/t/ins000001.test
client/mysqlbinlog.cc:
Removed random chars after filename for LOAD DATA INFILE
client/mysqltest.c:
Add support for --replace for 'exec'
mysql-test/r/drop_temp_table.result:
Updated results after quoting change
mysql-test/r/fulltext_multi.result:
Updated results after quoting change
mysql-test/r/fulltext_order_by.result:
Updated results after quoting change
mysql-test/r/insert.result:
New tests
mysql-test/r/insert_select.result:
Updated results after quoting change
mysql-test/r/mix_innodb_myisam_binlog.result:
Updated results after quoting change
mysql-test/r/mysqlbinlog.result:
Updated results after quoting change
mysql-test/r/rpl_log.result:
Updated results after quoting change
mysql-test/t/fulltext_multi.test:
Remove 'use'
mysql-test/t/fulltext_order_by.test:
Remove 'use'
mysql-test/t/insert.test:
Merge test with ins0000001.test
mysql-test/t/mysqlbinlog.test:
Don't refer to install dir in result
sql/log_event.cc:
Add quoting for use `database` for mysqlbinlog
support-files/mysql.server.sh:
Move pid_file test after arguments have been parsed
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 # |