summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-09-09 20:07:12 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-09-09 20:07:12 +0200
commit9b87a53a10d7022c8b8adcdf19b735103ebcec09 (patch)
treea75131c140e5c69108ee80898969b2deb873fd5e /support-files
parentefc72ecf4084e07268b7e93e0696aaceafff9039 (diff)
downloadmariadb-git-9b87a53a10d7022c8b8adcdf19b735103ebcec09.tar.gz
Reverted the changes to spec file to ignore mysqld_safe.pid 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 93a74ac8445..8fbf9f08b9e 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -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 | 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' ;;
@@ -1195,8 +1195,8 @@ fi
# 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
* Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>