Merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1175309 into lp:percona-xtrabackup/2.1

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 585
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1175309
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 13 lines (+3/-1)
1 file modified
test/inc/common.sh (+3/-1)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1175309
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+162062@code.launchpad.net

Description of the change

Merge lp:~sergei.glushchenko/percona-xtrabackup/2.0-xb-bug1175309 to 2.1

No manual changes at all. Jenkins is failed due to bug 1175318.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/inc/common.sh'
2--- test/inc/common.sh 2013-04-28 18:36:35 +0000
3+++ test/inc/common.sh 2013-05-02 09:33:27 +0000
4@@ -31,7 +31,9 @@
5 {
6 vlog "Calling mysql_install_db"
7 cd $MYSQL_BASEDIR
8- $MYSQL_INSTALL_DB --defaults-file=${MYSQLD_VARDIR}/my.cnf ${MYSQLD_EXTRA_ARGS}
9+ $MYSQL_INSTALL_DB --defaults-file=${MYSQLD_VARDIR}/my.cnf \
10+ --basedir=${MYSQL_BASEDIR} \
11+ ${MYSQLD_EXTRA_ARGS}
12 cd -
13 }
14

Subscribers

People subscribed via source and target branches