summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@oracle.com>2013-04-09 14:00:05 +0530
committerNirbhay Choubey <nirbhay.choubey@oracle.com>2013-04-09 14:00:05 +0530
commit4ad004c2b4d9d5abf1c135678eba1b1af39b9b97 (patch)
tree48bab353e7eb1f4323314664bfe75c0b716c3028 /support-files
parent6777c3fa3f2f4e685e948c5e5f287af9829ad977 (diff)
downloadmariadb-git-4ad004c2b4d9d5abf1c135678eba1b1af39b9b97.tar.gz
Backporting patch for bug#15852074.
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 87198fc9cf5..8d8e91049f6 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -416,7 +416,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 "$use_mysqld_safe" = "0" ; then
lockfile=/var/lock/subsys/mysqlmanager
else