[Pkg-mysql-commits] r1732 - in mysql-dfsg-5.1/branches/unstable/debian: . patches

[Norbert Tretkowski]

tags 545044 pending
thanks

Author: nobse
Date: 2009-09-06 17:44:01 +0000 (Sun, 06 Sep 2009)
New Revision: 1732

Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
Log:
Wait in the SIGHUP trap to avoid killing an existing mysqld process when a HUP signal is sent to mysqld_safe.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-05 13:58:36 UTC (rev 1731)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-06 17:44:01 UTC (rev 1732)
@@ -1,9 +1,12 @@
 mysql-dfsg-5.1 (5.1.38-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Wait in the SIGHUP trap to avoid killing an existing mysqld process when a
+    HUP signal is sent to mysqld_safe, patch based based on Mathias Gug's fix
+    from 5.0 series. (closes: #545044)
   * Drop --without-ndbcluster from configure call.
 
- -- Norbert Tretkowski <nobse at debian.org>  Fri, 04 Sep 2009 10:25:01 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Sun, 06 Sep 2009 19:41:46 +0200
 
 mysql-dfsg-5.1 (5.1.37-2) unstable; urgency=low
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch	2009-09-05 13:58:36 UTC (rev 1731)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch	2009-09-06 17:44:01 UTC (rev 1732)
@@ -34,7 +34,7 @@
 +# From now on, we catch signals to do a proper shutdown of mysqld
 +# when signalled to do so.
 +#
-+trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh' 1 # HUP
++trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh & wait' 1 # HUP
 +trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf shutdown' 2 3 15 # INT QUIT and TERM
 +
 +#