Percona Server with XtraDB

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

Proposed by Ignacio Nin on 2013-04-23
Status: Merged
Approved by: Stewart Smith on 2013-04-23
Approved revision: 473
Merged at revision: 508
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1168032
Merge into: lp:percona-server/5.5
Diff against target: 26 lines (+6/-5) 1 file modified
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1168032
Reviewer Review Type Date Requested Status
Stewart Smith (community) 2013-04-23 Approve on 2013-04-23
Percona core 2013-04-23 Pending
Review via email: mp+160263@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve

Preview Diff

1=== modified file 'build/percona-server.spec'
2--- build/percona-server.spec 2013-04-16 06:45:12 +0000
3+++ build/percona-server.spec 2013-04-23 05:12:51 +0000
4@@ -720,16 +720,17 @@
5 NEW_VERSION=%{mysql_version}-%{release}
6 STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
7
8+if [ -f $STATUS_FILE ] ; then
9+ SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
10+else
11+ SERVER_TO_START=''
12+fi
13+
14 if [ $1 -eq 1 ]; then
15 # ----------------------------------------------------------------------
16 # Create data directory if needed, check whether upgrade or install
17 # ----------------------------------------------------------------------
18 if [ ! -d $mysql_datadir ] ; then mkdir -m 755 $mysql_datadir; fi
19-if [ -f $STATUS_FILE ] ; then
20- SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
21-else
22- SERVER_TO_START=''
23-fi
24 # echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
25 if [ ! -d $mysql_datadir/mysql ] ; then
26 mkdir $mysql_datadir/mysql;

Subscribers

People subscribed via source and target branches