percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-19 17:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2.2 r551.

Browse Source
This commit is contained in:
Daniel Nichter
2013-03-11 10:51:30 -06:00
parent 9a33090514 e3346332e1
commit 270962ad54
257 changed files with 15883 additions and 236988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sandbox.pm
View File

@@ -343,7 +343,7 @@ sub wait_for_slaves {
sub {
my ($pong) = $slave2_dbh->selectrow_array(
"SELECT ping FROM percona_test.sentinel WHERE id=1 /* wait_for_slaves */");
return $ping eq $pong;
return $ping eq ($pong || '');
}, undef, 300
);
}
@@ -360,7 +360,8 @@ sub verify_test_data {
'SELECT * FROM percona_test.checksums',
'db_tbl');
$self->{checksum_ref} = $ref unless $self->{checksum_ref};
my @tables_in_mysql = grep { !/^innodb_(?:table|index)_stats$/ }
my @tables_in_mysql = grep { !/^(?:innodb|slave)_/ }
grep { !/_log$/ }
@{$master->selectcol_arrayref('SHOW TABLES FROM mysql')};
my @tables_in_sakila = qw(actor address category city country customer
film film_actor film_category film_text inventory