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

[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)]

Resubmitting with changes

review: Needs Resubmitting

[Alexey Kopytov (akopytov)]

Since PS 5.5.32-rel31.0 has already been released, the version in the changelog needs to be updated.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

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	2013-05-27 13:46:13 +0000
+++ build/debian/changelog	2013-09-25 16:46:46 +0000
@@ -1,3 +1,11 @@
+percona-server-5.5 (5.5.33-rel31.2) 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.5 (5.5.13-rel20.4) unstable; urgency=low
 
   * Update versions to 5.5.13

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-08-27 14:41:58 +0000
+++ build/debian/rules	2013-09-25 16:46:46 +0000
@@ -96,7 +96,7 @@
 	cd UDF && make DESTDIR=$(TMP) install
 
 override_dh_installinit:
-	dh_installinit --name=mysql
+	dh_installinit --name=mysql --error-handler=:
 
 override_dh_strip:
 	dh_strip --dbg-package=percona-server-5.5-dbg