diff options
author | unknown <balasubramanian.kandasamy@oracle.com> | 2013-09-20 11:34:06 +0200 |
---|---|---|
committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-09-20 11:34:06 +0200 |
commit | b4d1db04ae3c65daa6e7ec73ede42000b795ae21 (patch) | |
tree | ae67e44bad7de31b96d6ab048b9c43a311d61b48 | |
parent | 1d40f2ad64ee87c1460a3578179dfbdc6896e2dd (diff) | |
parent | 543b6e02246db25d8a61574fc709b28e7720d1a0 (diff) | |
download | mariadb-git-b4d1db04ae3c65daa6e7ec73ede42000b795ae21.tar.gz |
Merge from mysql-5.5.34-release
-rw-r--r-- | support-files/mysql.spec.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index a9cbfada089..800b333a5cf 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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 -1 $PID_FILE_PATT 2>/dev/null | wc -l` case $NR_PID_FILES in 0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server 1 ) SERVER_TO_START='true' ;; @@ -1215,6 +1215,9 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> +- Updated logic to get the correct count of PID files + * Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - Added provides lowercase mysql tags |