percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-26 01:02:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added 2.2.12 tag - Solved minor test issue

Browse Source
This commit is contained in:
Frank Cizmich
2014-11-07 18:14:54 -02:00
parent b1d1997c8d
commit 3c2d40570e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
t/pt-table-checksum/pxc.t
-4
View File
@@ -278,11 +278,7 @@ for my $args (
# Wait for the slave to apply the binlogs from node1 (its master). # Wait for the slave to apply the binlogs from node1 (its master).
# Then change it so it's not consistent. # Then change it so it's not consistent.
PerconaTest::wait_for_table($slave_dbh, 'test.t'); PerconaTest::wait_for_table($slave_dbh, 'test.t');
<<<<<<< TREE
$sb->wait_for_slaves(master => 'node1', slave => 'cslave1'); $sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
=======
$sb->wait_for_slaves(master=> 'node1', slave => 'cslave1');
>>>>>>> MERGE-SOURCE
$slave_dbh->do("update test.t set c='zebra' where c='z'"); $slave_dbh->do("update test.t set c='zebra' where c='z'");
$output = output( $output = output(