diff -u mysql-dfsg-5.0-5.1.30really5.0.75/debian/changelog mysql-dfsg-5.0-5.1.30really5.0.75/debian/changelog --- mysql-dfsg-5.0-5.1.30really5.0.75/debian/changelog +++ mysql-dfsg-5.0-5.1.30really5.0.75/debian/changelog @@ -1,3 +1,11 @@ +mysql-dfsg-5.0 (5.1.30really5.0.75-0ubuntu10.1~ppa1) jaunty; urgency=low + + * debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch: + - Don't trap sighup as it's causing mysqld to refresh while it has + open connections. (LP: #326768) + + -- Mario Limonciello Mon, 04 May 2009 14:42:49 -0500 + mysql-dfsg-5.0 (5.1.30really5.0.75-0ubuntu10) jaunty; urgency=low * debian/mysql-server-5.0.postinst: Clear out the second password diff -u mysql-dfsg-5.0-5.1.30really5.0.75/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch mysql-dfsg-5.0-5.1.30really5.0.75/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch --- mysql-dfsg-5.0-5.1.30really5.0.75/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch +++ mysql-dfsg-5.0-5.1.30really5.0.75/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch @@ -5,33 +5,32 @@ ## DP: Executes /etc/init.d/mysql on signals @DPATCH@ - ---- old/scripts/mysqld_safe.sh 2005-02-15 14:43:48.000000000 -0800 -+++ new/scripts/mysqld_safe.sh 2005-02-21 13:02:55.000000000 -0800 -@@ -10,8 +10,6 @@ - # mysql.server works by first doing a cd to the base directory and from there - # executing mysqld_safe +diff -urNad mysql-dfsg-5.0-5.1.30really5.0.75~/scripts/mysqld_safe.sh mysql-dfsg-5.0-5.1.30really5.0.75/scripts/mysqld_safe.sh +--- mysql-dfsg-5.0-5.1.30really5.0.75~/scripts/mysqld_safe.sh 2009-05-04 14:45:42.000000000 -0500 ++++ mysql-dfsg-5.0-5.1.30really5.0.75/scripts/mysqld_safe.sh 2009-05-04 14:45:59.000000000 -0500 +@@ -16,7 +16,7 @@ + # This command can be used as pipe to syslog. With "-s" it also logs to stderr. + ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" -trap '' 1 2 3 15 # we shouldn't let anyone kill us -- ++trap '' 1 + umask 007 - KILL_MYSQLD=1; -@@ -274,6 +272,13 @@ +@@ -354,6 +354,12 @@ fi # +# 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 shutdown' 2 3 15 # INT QUIT and TERM + +# # Uncomment the following lines if you want all tables to be automatically # checked and repaired during startup. You should add sensible key_buffer # and sort_buffer values to my.cnf to improve check performance or require -@@ -299,9 +304,9 @@ +@@ -379,9 +385,9 @@ rm -f $safe_mysql_unix_port $pid_file # Some extra safety if test -z "$args" then