1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-8543 mysql.server script not correctly handle --pid-file.

Browse Source
This commit is contained in:
Sergei Golubchik 2015-10-28 08:11:54 +01:00
parent d88aaaa841
commit d775ecdd01
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
support-files/mysql.server.sh
View File

@ -114,12 +114,6 @@ mode=$1 # start or stop
[ $# -ge 1 ] && shift [ $# -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 case `echo "testing\c"`,`echo -n testing` in
*c*,-n*) echo_n= echo_c= ;; *c*,-n*) echo_n= echo_c= ;;
*c*,*) echo_n=-n echo_c= ;; *c*,*) echo_n=-n echo_c= ;;
@ -211,6 +205,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 server mysql_server mysql.server`
parse_server_arguments "$@"
# wait for the pid file to disappear # wait for the pid file to disappear
wait_for_gone () { wait_for_gone () {
@ -308,7 +303,7 @@ case "$mode" in
then then
# Give extra arguments to mysqld with the my.cnf file. This script # Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade. # 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=$? wait_for_ready; return_value=$?
# Make lock for RedHat / SuSE # Make lock for RedHat / SuSE
@ -356,8 +351,8 @@ case "$mode" in
'restart') 'restart')
# Stop the service and regardless of whether it was # Stop the service and regardless of whether it was
# running or not, start it again. # running or not, start it again.
if $0 stop $other_args; then if $0 stop "$@"; then
$0 start $other_args $0 start "$@"
else else
log_failure_msg "Failed to stop running server, so refusing to try to start." log_failure_msg "Failed to stop running server, so refusing to try to start."
exit 1 exit 1