diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-08-30 17:14:46 +0200 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-08-30 17:14:46 +0200 |
| commit | 01c83f09265efd84f9f53b89dc8d25274c85513f (patch) | |
| tree | a208bcf2958890d8ef304c04a227c8c592543317 /support-files | |
| parent | 52a3029df9d517d2e9c013e0f442d1a404842490 (diff) | |
| download | mariadb-git-01c83f09265efd84f9f53b89dc8d25274c85513f.tar.gz | |
Fix to ignore mysqld_safe.pid
Diffstat (limited to 'support-files')
| -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 bcd66b96c2b..ea6eddd7279 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -643,7 +643,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 @@ -716,7 +716,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' ;; |