Merge up to mysql-next-mr-bugfixing

7e458c58 · Jonathan Perkin · 5098a2bc · d456e447 · 7e458c58
Commit 7e458c58 authored Dec 16, 2009 by Jonathan Perkin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

support-files/mysql.server.sh support-files/mysql.server.sh +1 -1

No files found.
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -303,7 +303,7 @@ case "$mode" in
    then
      mysqld_pid=`cat "$mysqld_pid_file_path"`
-      if (kill -9 $mysqld_pid 2>/dev/null)
+      if (kill -0 $mysqld_pid 2>/dev/null)
      then
        echo $echo_n "Shutting down MySQL"
        kill $mysqld_pid