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

[Ignacio Nin]

Rebase of lp:~stewart/percona-server/bug1168032 to revno 472 to be able to merge to PXC and 5.6 in the future.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-04-16 06:45:12 +0000
+++ build/percona-server.spec	2013-04-23 05:12:51 +0000
@@ -720,16 +720,17 @@
 NEW_VERSION=%{mysql_version}-%{release}
 STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
 
+if [ -f $STATUS_FILE ] ; then
+	SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
+else
+	SERVER_TO_START=''
+fi
+
 if [ $1 -eq 1 ]; then
 # ----------------------------------------------------------------------
 # Create data directory if needed, check whether upgrade or install
 # ----------------------------------------------------------------------
 if [ ! -d $mysql_datadir ] ; then mkdir -m 755 $mysql_datadir; fi
-if [ -f $STATUS_FILE ] ; then
-	SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
-else
-	SERVER_TO_START=''
-fi
 # echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
 if [ ! -d $mysql_datadir/mysql ] ; then
 	mkdir $mysql_datadir/mysql;