Merge lp:~akopytov/percona-xtrabackup/bug1284078-2.1 into lp:percona-xtrabackup/2.1

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 726
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1284078-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 31 lines (+5/-8)
1 file modified
test/t/bug1250375.sh (+5/-8)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1284078-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+208549@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 'test/t/bug1250375.sh'
2--- test/t/bug1250375.sh 2014-01-22 17:09:37 +0000
3+++ test/t/bug1250375.sh 2014-02-27 08:52:47 +0000
4@@ -16,13 +16,6 @@
5 wsrep_node_address=$ADDR
6 "
7
8-if [ -n ${WSREP_DEBUG:-} ]
9-then
10- MYSQLD_EXTRA_MY_CNF_OPTS="$MYSQLD_EXTRA_MY_CNF_OPTS
11-wsrep_provider_options=\"debug=1\"
12-"
13-fi
14-
15 start_server
16
17 # Load some data so we have a non-empty Executed_Gtid_Set
18@@ -47,8 +40,12 @@
19 count=$((count+1))
20 done <<< "`run_cmd $MYSQL $MYSQL_ARGS -Nse 'SHOW MASTER STATUS\G' mysql`"
21
22-if [ ! -f "$backup_dir/$master_file" ]
23+cd $backup_dir
24+
25+if [ ! -f $master_file ]
26 then
27 vlog "Could not find bin-log file in backup set, expecting to find $master_file"
28+ vlog "Backup directory contents:"
29+ ls -l
30 exit 1
31 fi

Subscribers

People subscribed via source and target branches

to all changes: