diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-08-29 14:42:55 +0200 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-08-29 14:42:55 +0200 |
| commit | 095b6645b0eba758ab258ca9587da7e0edd34f16 (patch) | |
| tree | 599f74524bfb02bb3a033d57269c088264d5585c /support-files | |
| parent | 356b641454b1a9d8cd5ba1638972cb030de89738 (diff) | |
| download | mariadb-git-095b6645b0eba758ab258ca9587da7e0edd34f16.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.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 2d8aa78464b..bcd66b96c2b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -643,7 +643,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 @@ -1194,6 +1194,9 @@ 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 + * Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com> - Disable "maintainer mode" in debug builds, there is a cast ulonglong -> int |