diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
| commit | 4d1511296288782df0e3d9373396724e250b24c1 (patch) | |
| tree | 9fa47d141b71933859d6c2da585e5bb5e52db212 /support-files/mysql.server.sh | |
| parent | 17b0b45b1de41a1b188c5de6c3e9d8e6ecc48a72 (diff) | |
| parent | d775ecdd010daad4dc6147fba58acd006bf2c60c (diff) | |
| download | mariadb-git-4d1511296288782df0e3d9373396724e250b24c1.tar.gz | |
Merge tag 'mariadb-10.0.22' into 10.0-galera
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 76a0622589e..c9398b6c020 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -123,12 +123,6 @@ mode=$1 # start or stop [ $# -ge 1 ] && shift - -other_args="$*" # uncommon, but needed when called from an RPM upgrade action - # Expected: "--skip-networking --skip-grant-tables" - # They are not checked here, intentionally, as it is the resposibility - # of the "spec" file author to give correct arguments only. - case `echo "testing\c"`,`echo -n testing` in *c*,-n*) echo_n= echo_c= ;; *c*,*) echo_n=-n echo_c= ;; @@ -220,6 +214,7 @@ else fi parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server` +parse_server_arguments "$@" # wait for the pid file to disappear wait_for_gone () { @@ -324,7 +319,7 @@ case "$mode" in then # Give extra arguments to mysqld with the my.cnf file. This script # may be overwritten at next upgrade. - $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null 2>&1 & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >/dev/null 2>&1 & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE @@ -372,8 +367,8 @@ case "$mode" in 'restart') # Stop the service and regardless of whether it was # running or not, start it again. - if $0 stop $other_args; then - if ! $0 start $other_args; then + if $0 stop "$@"; then + if ! $0 start "$@"; then log_failure_msg "Failed to restart server." exit 1 fi |