Merge lp:~akopytov/percona-xtrabackup/bug1373984-2.1 into lp:percona-xtrabackup/2.2

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 5026
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1373984-2.1
Merge into: lp:percona-xtrabackup/2.2
Diff against target: 26 lines (+3/-5)
1 file modified
storage/innobase/xtrabackup/test/t/bug740489.sh (+3/-5)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1373984-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+235990@code.launchpad.net
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 'storage/innobase/xtrabackup/test/t/bug740489.sh'
2--- storage/innobase/xtrabackup/test/t/bug740489.sh 2013-04-27 18:46:54 +0000
3+++ storage/innobase/xtrabackup/test/t/bug740489.sh 2014-09-25 16:08:07 +0000
4@@ -12,19 +12,17 @@
5
6 defaults_extra_file=$topdir/740489.cnf
7
8-cat > $defaults_extra_file <<EOF
9-[mysqld]
10-datadir=${MYSQLD_DATADIR}
11+cp $MYSQLD_VARDIR/my.cnf $defaults_extra_file
12
13+cat >> $defaults_extra_file <<EOF
14 [client]
15-user=root
16 password=password
17 EOF
18
19 backup_dir=$topdir/backup
20 run_cmd $IB_BIN \
21 --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \
22- --ibbackup=$XB_BIN --no-timestamp $backup_dir
23+ --ibbackup=$XB_BIN --no-version-check --no-timestamp $backup_dir
24 vlog "Backup created in directory $backup_dir"
25
26 run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF

Subscribers

People subscribed via source and target branches

to all changes: