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

[Ignacio Nin]

Fixes for bugs lp:1170024 and lp:1174426.

This is a merge for 5.5 branch only (see comment at https://code.launchpad.net/~abychko/percona-server/bug1170024-5.5/+merge/159454/comments/361415).

The disadvantages for rebasing would be that it would be needed to rebase on revno 472 (460 is the GCA), but also that releases have been made particularly with the fix for lp:1170024.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-04-23 06:02:56 +0000
+++ build/percona-server.spec	2013-05-15 12:50:56 +0000
@@ -744,20 +744,6 @@
 if [ ! -d $mysql_datadir/test ]; then 
         mkdir $mysql_datadir/test; 
 fi
-%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
-fi 
-# ----------------------------------------------------------------------
-# Make MySQL start/shutdown automatically when the machine does it.
-# ----------------------------------------------------------------------
-# NOTE: This still needs to be debated. Should we check whether these links
-# for the other run levels exist(ed) before the upgrade?
-# use chkconfig on Enterprise Linux and newer SuSE releases
-if [ -x /sbin/chkconfig ] ; then
-        /sbin/chkconfig --add mysql
-# use insserv for older SuSE Linux versions
-elif [ -x /sbin/insserv ] ; then
-        /sbin/insserv %{_sysconfdir}/init.d/mysql
-fi
 
 # ----------------------------------------------------------------------
 # Create a MySQL user and group. Do not report any problems if it already
@@ -773,6 +759,22 @@
 # ----------------------------------------------------------------------
 # Initiate databases if needed
 # ----------------------------------------------------------------------
+%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
+fi 
+
+# ----------------------------------------------------------------------
+# Make MySQL start/shutdown automatically when the machine does it.
+# ----------------------------------------------------------------------
+# NOTE: This still needs to be debated. Should we check whether these links
+# for the other run levels exist(ed) before the upgrade?
+# use chkconfig on Enterprise Linux and newer SuSE releases
+if [ -x /sbin/chkconfig ] ; then
+        /sbin/chkconfig --add mysql
+# use insserv for older SuSE Linux versions
+elif [ -x /sbin/insserv ] ; then
+        /sbin/insserv %{_sysconfdir}/init.d/mysql
+fi
+
 # ----------------------------------------------------------------------
 # Upgrade databases if needed would go here - but it cannot be automated yet
 # ----------------------------------------------------------------------