summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-12-10 13:00:08 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2015-12-10 13:00:08 -0500
commitca07ee85ea28d4b820498535508c6b23f089c22c (patch)
tree1445f647e7b3237031b04339b5be69a183e761eb /support-files
parent278ff1661a9fcf690b6b7604eb889fd287e6246a (diff)
parentd67aacb4fbb449ffa8db4e3d70fe8756d62b5222 (diff)
downloadmariadb-git-ca07ee85ea28d4b820498535508c6b23f089c22c.tar.gz
Merge tag 'mariadb-5.5.47' into 5.5-galera
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index fb9e01ded43..d1c73d3db7d 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -219,7 +219,7 @@ else
fi
fi
-parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server`
+parse_server_arguments `$print_defaults $extra_args --mysqld mysql.server`
# wait for the pid file to disappear
wait_for_gone () {