summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-08-29 14:33:28 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-08-29 14:33:28 +0200
commite2c77ad949ec8741384058bce37770d7a73c96a3 (patch)
tree919594a026441e4890cae6510cd37699c9a7e32b /support-files
parent9e0cd2df6f393205112dc02a16ec02aacf37b8a5 (diff)
downloadmariadb-git-e2c77ad949ec8741384058bce37770d7a73c96a3.tar.gz
Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index a9cbfada089..216c5ede66b 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -30,7 +30,7 @@
%global mysqld_group mysql
%global mysqldatadir /var/lib/mysql
-%global release 1
+%global release 2
#
@@ -636,7 +636,7 @@ then
fi
if [ -z "$PID_FILE_PATT" ]
then
- PID_FILE_PATT="$mysql_datadir/*.pid"
+ PID_FILE_PATT=`ls $mysql_datadir/*.pid 2>/dev/null | grep -v "mysqld_safe.pid"`
fi
# Check if we can safely upgrade. An upgrade is only safe if it's from one
@@ -1215,6 +1215,9 @@ 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
+
* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
- Added provides lowercase mysql tags