From bb82aecef9ba33077ccc5eb6b86a33b7e5f77da6 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Fri, 30 Aug 2013 15:02:16 +0200 Subject: [PATCH] Fix to ignore mysqld_safe.pid --- support-files/mysql.spec.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 372638c29c3..bd354056e60 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -636,7 +636,7 @@ then fi if [ -z "$PID_FILE_PATT" ] then - PID_FILE_PATT=`ls "$mysql_datadir/*.pid" 2> /dev/null | grep -v "mysqld_safe.pid"` + PID_FILE_PATT="$mysql_datadir/*.pid" fi # Check if we can safely upgrade. An upgrade is only safe if it's from one @@ -718,7 +718,7 @@ fi # We assume that if there is exactly one ".pid" file, # it contains the valid PID of a running MySQL server. -NR_PID_FILES=`ls $PID_FILE_PATT 2>/dev/null | wc -l` +NR_PID_FILES=`ls $PID_FILE_PATT 2>/dev/null | grep -v "mysqld_safe.pid" | wc -l` case $NR_PID_FILES in 0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server 1 ) SERVER_TO_START='true' ;;