diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2000-11-29 15:21:48 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2000-11-29 15:21:48 -0500 |
| commit | d3cce712223312cd1f3341e462918162f4261246 (patch) | |
| tree | 9ddfe8fb21a1b1a4814dba13d7ab541c56165b38 /scripts/safe_mysqld.sh | |
| parent | ef2356d653cc40096b45a7d5bb9fb82f379dca66 (diff) | |
| download | mariadb-git-d3cce712223312cd1f3341e462918162f4261246.tar.gz | |
Clean up safe_mysqld, mysql_install_db and mysql.server. They
should now work the way you expect them to (process command-line
arguments consistently).
scripts/mysql_install_db.sh:
- use mysql_print_defaults instead of awk hack
- actually pass unrecognized options to mysqld, instead of
ignoring them
- recognize a [mysql_install_db] section of my.cnf
- general cleanup
scripts/safe_mysqld.sh:
- handle a relative pid-file the same way mysqld does
support-files/mysql.server.sh:
- use mysql_print_defaults instead of awk hack
- recognize a [mysql_server] section of my.cnf
- handle a relative pid-file the same way mysqld does
- general cleanup
Docs/manual.texi:
- News item: safe_mysqld, mysql.server and mysql_install_db have
been modified
Diffstat (limited to 'scripts/safe_mysqld.sh')
| -rw-r--r-- | scripts/safe_mysqld.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index 315859530b5..2fa9134b65c 100644 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -118,7 +118,15 @@ then exit 1 fi -test -z "$pid_file" && pid_file=$DATADIR/`@HOSTNAME@`.pid +if test -z "$pid_file" +then + pid_file=$DATADIR/`@HOSTNAME@`.pid +else + case "$pid_file" in + /* ) ;; + * ) pid_file="$DATADIR/$pid_file" ;; + esac +fi test -z "$err_log" && err_log=$DATADIR/`@HOSTNAME@`.err export MYSQL_UNIX_PORT |