diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-08-30 15:02:16 +0200 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-08-30 15:02:16 +0200 |
| commit | bb82aecef9ba33077ccc5eb6b86a33b7e5f77da6 (patch) | |
| tree | b650f72c5714a8cfd7aadb8fd0099fd6e07f2531 /support-files/mysql.spec.sh | |
| parent | 1f6434ba3d578159baac2adb2fec9e6ada04ecee (diff) | |
| download | mariadb-git-bb82aecef9ba33077ccc5eb6b86a33b7e5f77da6.tar.gz | |
Fix to ignore mysqld_safe.pid
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 4 |
1 files 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' ;; |