Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script

parent 4f0e7c03
...@@ -643,7 +643,7 @@ then ...@@ -643,7 +643,7 @@ then
fi fi
if [ -z "$PID_FILE_PATT" ] if [ -z "$PID_FILE_PATT" ]
then then
PID_FILE_PATT="$mysql_datadir/*.pid" PID_FILE_PATT=`ls $mysql_datadir/*.pid 2>/dev/null | grep -v "mysqld_safe.pid"`
fi fi
# Check if we can safely upgrade. An upgrade is only safe if it's from one # Check if we can safely upgrade. An upgrade is only safe if it's from one
...@@ -1194,6 +1194,9 @@ fi ...@@ -1194,6 +1194,9 @@ fi
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %changelog
* Thu Aug 29 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
- Added logic to ignore mysqld_safe.pid file created by mysqld_safe script
* Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com> * Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
- Disable "maintainer mode" in debug builds, there is a cast ulonglong -> int - Disable "maintainer mode" in debug builds, there is a cast ulonglong -> int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment