Percona XtraBackup moved to https://jira.percona.com/projects/PXB

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

Proposed by Alexey Kopytov on 2014-01-13

Status:

Merged

Approved by:

Alexey Kopytov on 2014-01-13

Approved revision:

no longer in the source branch.

Merged at revision:

711

Proposed branch:

Merge into:

Diff against target:

1 file modified

test/t/bug1037379.sh (+0/-4)

To merge this branch:

bzr merge lp:~akopytov/percona-xtrabackup/bug1268325-2.1

Related bugs:

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alexey Kopytov (community)			Approve on 2014-01-13
Review via email: mp+201338@code.launchpad.net

Avoid grepping $OUTFILE to detect errors. This is unreliable as output
from multiple processes writing to the same file may be garbled.

Revision history for this message

Alexey Kopytov (akopytov) on 2014-01-13:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'test/t/bug1037379.sh'
2	--- test/t/bug1037379.sh 2012-10-16 15:05:23 +0000
3	+++ test/t/bug1037379.sh 2014-01-13 07:39:26 +0000
4	@@ -43,8 +43,6 @@
5	run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --safe-slave-backup \
6	--safe-slave-backup-timeout=3 $topdir/backup1
7
8	-grep -q "Slave_open_temp_tables did not become zero" $OUTFILE
9	-
10	# Check that the SQL thread is running
11	run_cmd $MYSQL $MYSQL_ARGS -e "SHOW SLAVE STATUS\G" \|
12	egrep 'Slave_SQL_Running:[[:space:]]+Yes'
13	@@ -60,8 +58,6 @@
14	run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --safe-slave-backup \
15	--safe-slave-backup-timeout=3 $topdir/backup2
16
17	-grep -c "Slave_open_temp_tables did not become zero" $OUTFILE \| grep -w 2
18	-
19	# Check that the SQL thread is stopped
20	run_cmd $MYSQL $MYSQL_ARGS -e "SHOW SLAVE STATUS\G" \|
21	egrep 'Slave_SQL_Running:[[:space:]]+No'