Merge lp:~clint-fewbar/ubuntu/lucid/mysql-dfsg-5.1/increase-killtimeout into lp:ubuntu/lucid-updates/mysql-dfsg-5.1

[Clint Byrum]

SRU to lucid for 620441

[Bryce Harrington (bryce)]

Looks good

review: Approve (packaging)

[Dave Walker (davewalker)]

In lucid-proposed queue.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-09 13:02:13 +0000
+++ debian/changelog	2010-11-20 20:31:16 +0000
@@ -1,3 +1,9 @@
+mysql-dfsg-5.1 (5.1.41-3ubuntu12.8) lucid-proposed; urgency=low
+
+  * raising kill timeout to 300 to help avoid table corruption (LP: #620441)
+
+ -- Clint Byrum <[e-mail]>  Sat, 20 Nov 2010 12:06:00 -0800
+
 mysql-dfsg-5.1 (5.1.41-3ubuntu12.7) lucid-security; urgency=low
 
   * SECURITY UPDATE: denial of service via UPGRADE DATA DIRECTORY NAME

=== modified file 'debian/mysql-server-5.1.mysql.upstart'
--- debian/mysql-server-5.1.mysql.upstart	2010-07-28 11:37:25 +0000
+++ debian/mysql-server-5.1.mysql.upstart	2010-11-20 20:31:16 +0000
@@ -13,6 +13,9 @@
 env HOME=/etc/mysql
 umask 007
 
+# The default of 5 seconds is too low for mysql which needs to flush buffers
+kill timeout 300
+
 pre-start script
     #Sanity checks
     [ -r $HOME/my.cnf ]