Automerge lp:~tplavcic/percona-server/bug-1311840-5.6

laurynas-biveinis · Dec 22, 2014 · 7e8b64c · 7e8b64c
2 parents c007eaa + cee419e
commit 7e8b64c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/build-ps/debian/percona-server-server-5.6.config b/build-ps/debian/percona-server-server-5.6.config
diff --git a/build-ps/percona-server.spec b/build-ps/percona-server.spec
@@ -850,6 +850,12 @@ fi
 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
+
 # ----------------------------------------------------------------------
 # Create data directory if needed, check whether upgrade or install
 # ----------------------------------------------------------------------