Merge lp:~stewart/percona-server/bug1168032 into lp:percona-server/5.5

[Stewart Smith]

Fix rather annoying packaging bug in SPEC file: on upgrade the server would not be started again, leading to all sorts of trouble if you have unattended automatic updates turned on.

[Ignacio Nin (ignacio-nin)]

Confirmed to fix this regression

review: Approve

[Ignacio Nin (ignacio-nin)]

5.1 confirmed not to be affected.

Percona XtraBackup 5.5.30 is affected, since the regression was introduced in revno 472 in the 5.5 tree and this revision has been merged.

Percona Server 5.6 is not affected yet since 472 hasn't been merged, but it will be as soon as this revision gets to its tree.

In order to merge to PXC and to be able in the future to merge to 5.6, we need to rebase the fix on an earlier revision (ideally 472). Rejecting this merge and rebasing it to 472 at lp:~ignacio-nin/percona-server/5.5-bug1168032, will request reviews there.

review: Disapprove

[Stewart Smith (stewart)]

Ignacio Nin <email address hidden> writes:
> Percona XtraBackup 5.5.30 is affected, since the regression was introduced in revno 472 in the 5.5 tree and this revision has been merged.
>
> Percona Server 5.6 is not affected yet since 472 hasn't been merged, but it will be as soon as this revision gets to its tree.
>
> In order to merge to PXC and to be able in the future to merge to 5.6, we need to rebase the fix on an earlier revision (ideally 472). Rejecting this merge and rebasing it to 472 at lp:~ignacio-nin/percona-server/5.5-bug1168032, will request reviews there.

Sounds good.

--
Stewart Smith

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-04-16 06:45:12 +0000
+++ build/percona-server.spec	2013-04-23 00:28:28 +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;