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

merge patch for bug#31785

Browse Source
This commit is contained in:
Daniel Fischer 2009-07-02 15:18:12 +02:00
parent a0fcfc0c12
commit 69945c6169
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,11 +358,18 @@ case "$mode" in
if test -s "$pid_file" if test -s "$pid_file"
then then
mysqlmanager_pid=`cat $pid_file` mysqlmanager_pid=`cat $pid_file`
echo $echo_n "Shutting down MySQL"
kill $mysqlmanager_pid if (kill -0 $mysqlmanager_pid 2>/dev/null)
# mysqlmanager should remove the pid_file when it exits, so wait for it. then
wait_for_pid removed "$mysqlmanager_pid"; return_value=$? echo $echo_n "Shutting down MySQL"
kill $mysqlmanager_pid
# mysqlmanager should remove the pid_file when it exits, so wait for it.
wait_for_pid removed "$mysqlmanager_pid"; return_value=$?
else
log_failure_msg "MySQL manager or server process #$mysqlmanager_pid is not running!"
rm $pid_file
fi
# delete lock for RedHat / SuSE # delete lock for RedHat / SuSE
if test -f $lock_dir if test -f $lock_dir
then then