Merge lp:~ignacio-nin/percona-server/5.1-bug1002500 into lp:percona-server/5.1

[Ignacio Nin]

Fix for bug #1002500

[Laurynas Biveinis (laurynas-biveinis)]

Does Stewart's 5.6 review comment apply on the lower branches too?

review: Needs Information

[Ignacio Nin (ignacio-nin)]

It does. Resubmitting with change.

review: Needs Resubmitting

[Alexey Kopytov (akopytov)]

Since PS 5.1.70-rel14.8 has already been released, the version in the changelog needs to be updated.

review: Needs Fixing

[Ignacio Nin (ignacio-nin)]

> Since PS 5.1.70-rel14.8 has already been released, the version in the
> changelog needs to be updated.

I'm struggling thinking what would be a sensitive version number? According to http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog, that's the version of the upstream package, and the changelog details what differences we do make in respect to the upstream package. We obviously haven't got an equivalent of an upstream package, but the version of the package to which this change was applied to was 5.1.70-14.8, because we patch the 5.1 version at its lowest common denominator with 5.5.

Patching it with the latest release (5.1.71-14.9) wouldn't make too much sense as well, and patching it with the number of the next release is impossible in much of the cases since we don't know the next release number (in most cases).

[Alexey Kopytov (akopytov)]

I don't understand how we could apply this change to 5.1.70-14.8 if this patch has not been merged yet? Was this MP merged to its release branch? If so, I agree, 5.1.70-rel14.8 is the right version and this MP can be considered approved.

review: Approve

[Ignacio Nin (ignacio-nin)]

Resubmitting with the debian changelog updated to the milestone targeted by the bug.

review: Needs Resubmitting

=== modified file 'build/debian/changelog'
--- build/debian/changelog	2012-01-04 18:48:32 +0000
+++ build/debian/changelog	2013-09-25 16:33:21 +0000
@@ -1,3 +1,11 @@
+percona-server-5.1 (5.1.72-rel14.10) unstable; urgency=low
+
+  * Added --error-handler=: to dh_installinit in order to
+    avoid an error when the server wouldn't start for any
+    reasons other than bad installation.
+
+ -- Ignacio Nin <[e-mail]>  Wed, 24 Jul 2013 11:20:00 -0300
+
 percona-server-5.1 (5.1.60-rel13.1) unstable; urgency=low
 
   * Changed name to percona-server-5.1.

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-08-27 15:05:45 +0000
+++ build/debian/rules	2013-09-25 16:33:21 +0000
@@ -302,7 +302,7 @@
 	dh_installlogrotate -a --name percona-server-server
 	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 	# started which might depend on a running database server.
-	dh_installinit -a --name=mysql -- defaults 19 21
+	dh_installinit -a --name=mysql --error-handler=: -- defaults 19 21
 	dh_installcron -a --name percona-server-server
 	dh_installman -a
 	dh_installinfo -a