diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:44:34 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:44:34 +0200 |
| commit | 8d1fdf09bb39663e8aad2a01f7ece81924e1f5a1 (patch) | |
| tree | 5fdae14ec96fd61b574fe1c8b2d62d304114c53c /support-files/mysql.server.sh | |
| parent | a39de6353abfb787723a61479fb20a942622a160 (diff) | |
| parent | cea2f8b6303b07906ab710b36c0c292a7865f52f (diff) | |
| download | mariadb-git-8d1fdf09bb39663e8aad2a01f7ece81924e1f5a1.tar.gz | |
merge of 5.1-main into mysql-trunk.
Changes to ha_innodb.cc are not propagated to plugin, they will come back
via Oracle/Innobase if needed.
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index bbd93b8f746..87198fc9cf5 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -358,11 +358,18 @@ case "$mode" in if test -s "$pid_file" then mysqlmanager_pid=`cat $pid_file` - 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=$? - + + if (kill -0 $mysqlmanager_pid 2>/dev/null) + then + 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 if test -f $lock_dir then |