summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@oracle.com>2013-04-09 14:03:35 +0530
committerNirbhay Choubey <nirbhay.choubey@oracle.com>2013-04-09 14:03:35 +0530
commitb350990a11bcf1a5c5f63c63ac0f34136a87342a (patch)
treecd830c65b66debcfc2f135832981ec29ccc852ea /support-files
parent90738111ff9235d10466c69597c28d06169be009 (diff)
parent4ad004c2b4d9d5abf1c135678eba1b1af39b9b97 (diff)
downloadmariadb-git-b350990a11bcf1a5c5f63c63ac0f34136a87342a.tar.gz
local merge.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index b5115a5c05e..7487d5acc0f 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -360,7 +360,13 @@ case "$mode" in
else
# Try to find appropriate mysqld process
mysqld_pid=`pidof $libexecdir/mysqld`
- if test -z $mysqld_pid ; then
+
+ # test if multiple pids exist
+ pid_count=`echo $mysqld_pid | wc -w`
+ if test $pid_count -gt 1 ; then
+ log_failure_msg "Multiple MySQL running but PID file could not be found ($mysqld_pid)"
+ exit 5
+ elif test -z $mysqld_pid ; then
if test -f "$lock_file_path" ; then
log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists"
exit 2