summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-09-09 19:49:44 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-09-09 19:49:44 +0200
commit5da2ffc7c94d6387d6ac8352deeb844751947a38 (patch)
tree19a80077a7209add8b5edbfa1eec8834f8aa4c9e /support-files
parent8550e6939149729d0ae7f4c4ce75a3772c5d1e7d (diff)
downloadmariadb-git-5da2ffc7c94d6387d6ac8352deeb844751947a38.tar.gz
Reverted the changes to spec file, updated the logic to get the correct count of PID files
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index bd354056e60..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 | grep -v "mysqld_safe.pid" | 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,8 +1215,8 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
-* Thu Aug 29 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Added logic to ignore mysqld_safe.pid file created by mysqld_safe script
+* 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