summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-02-12 13:14:55 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-12 13:14:55 +0100
commit5dce6aa1fe36d315f17eb9f4a0f5be808805e94c (patch)
tree009d91ac356abbed8e8d68d4109823fa7c3f67c9 /support-files
parented839052d74847c39484eff18652e5c6ba270266 (diff)
parent2a1be9cdf81ca77253faaf0e2dfc1dca7f7702f5 (diff)
downloadmariadb-git-5dce6aa1fe36d315f17eb9f4a0f5be808805e94c.tar.gz
Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh3
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