diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-22 09:31:24 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-22 09:31:24 +0300 |
| commit | f23b17696c0d6cef589c5b7bed12911609700ac4 (patch) | |
| tree | 54f1c9bcd072587e1860fe234c3264734b3b8dc5 /support-files | |
| parent | cb2c2fd8df18ad10792a1ccd20ac63d526786c54 (diff) | |
| parent | 9ce5872e038157e2a241d1b0726cbf56496fa5e1 (diff) | |
| download | mariadb-git-f23b17696c0d6cef589c5b7bed12911609700ac4.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- storage/ibmdb2i/ha_ibmdb2i.cc
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index ccf4d8ff51d..b5115a5c05e 100644 --- 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 |