Merge lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/increase-killtimeout into lp:ubuntu/maverick/mysql-5.1

Proposed by Clint Byrum
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/increase-killtimeout
Merge into: lp:ubuntu/maverick/mysql-5.1
Diff against target: 27 lines (+9/-0)
2 files modified
debian/changelog (+6/-0)
debian/mysql-server-5.1.mysql.upstart (+3/-0)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/increase-killtimeout
Reviewer Review Type Date Requested Status
Mathias Gug Pending
Review via email: mp+34884@code.launchpad.net

Description of the change

Raises kill timeout to 300 seconds

To post a comment you must log in.
Revision history for this message
Mathias Gug (mathiaz) wrote :

Looks good to me. Uploaded to maverick.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-21 22:16:40 +0000
3+++ debian/changelog 2010-09-08 17:12:57 +0000
4@@ -1,3 +1,9 @@
5+mysql-5.1 (5.1.49-1ubuntu8) maverick; urgency=low
6+
7+ * raising kill timeout to 300 to help avoid table corruption (LP: #620441)
8+
9+ -- Clint Byrum <clint@ubuntu.com> Wed, 08 Sep 2010 09:36:13 -0700
10+
11 mysql-5.1 (5.1.49-1ubuntu7) maverick; urgency=low
12
13 * debian/apparmor-profile: fix syntax error introduced in last upload
14
15=== modified file 'debian/mysql-server-5.1.mysql.upstart'
16--- debian/mysql-server-5.1.mysql.upstart 2010-08-01 11:23:11 +0000
17+++ debian/mysql-server-5.1.mysql.upstart 2010-09-08 17:12:57 +0000
18@@ -13,6 +13,9 @@
19 env HOME=/etc/mysql
20 umask 007
21
22+# The default of 5 seconds is too low for mysql which needs to flush buffers
23+kill timeout 300
24+
25 pre-start script
26 #Sanity checks
27 [ -r $HOME/my.cnf ]

Subscribers

People subscribed via source and target branches

to all changes: