diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-02-09 20:53:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-02-09 20:53:36 +0100 |
| commit | a34fd50ce1c4385a7e63522d3d248fc3d417449b (patch) | |
| tree | 589c153df647fe9fd26ba3e6bd622f71cb66297f /support-files/mysql.server.sh | |
| parent | f007f82881b4294fa00236780309522863259546 (diff) | |
| download | mariadb-git-a34fd50ce1c4385a7e63522d3d248fc3d417449b.tar.gz | |
MDEV-7478 log-basename unpredictable behavior in standalone mode
* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index a19f09fc91f..e23b8373ec4 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -146,6 +146,9 @@ parse_server_arguments() { --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` datadir_set=1 ;; + --log-basename=*|--hostname=*|--loose-log-basename=*) + mysqld_pid_file_path=`echo "$arg.pid" | sed -e 's/^[^=]*=//'` + ;; --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; esac |