percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 05:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge trunk r487.

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-07 11:52:33 -07:00
parent 97e0529798 a2eaed50e4
commit ea526799d3
68 changed files with 7739 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
t/lib/SchemaIterator.t
View File

@@ -77,20 +77,22 @@ sub test_so {
my $res = "";
my @objs;
while ( my $obj = $si->next() ) {
if ( $args{return_objs} ) {
push @objs, $obj;
}
else {
if ( $result_file || $args{ddl} ) {
$res .= "$obj->{db}.$obj->{tbl}\n";
$res .= "$obj->{ddl}\n\n" if $args{ddl} || $tp;
eval {
while ( my $obj = $si->next() ) {
if ( $args{return_objs} ) {
push @objs, $obj;
}
else {
$res .= "$obj->{db}.$obj->{tbl} ";
if ( $result_file || $args{ddl} ) {
$res .= "$obj->{db}.$obj->{tbl}\n";
$res .= "$obj->{ddl}\n\n" if $args{ddl} || $tp;
}
else {
$res .= "$obj->{db}.$obj->{tbl} ";
}
}
}
}
};
return \@objs if $args{return_objs};
@@ -114,6 +116,9 @@ sub test_so {
$args{test_name},
);
}
elsif ( $args{lives_ok} ) {
is($EVAL_ERROR, '', $args{test_name});
}
else {
is(
$res,
@@ -402,6 +407,44 @@ test_so(
test_name => "Resume from ignored table"
);
# ############################################################################
# pt-table-checksum v2 fails when --resume + --ignore-database is used
# https://bugs.launchpad.net/percona-toolkit/+bug/911385
# ############################################################################
test_so(
filters => ['--ignore-databases', 'sakila,mysql'],
result => "",
lives_ok => 1,
resume => 'sakila.payment',
test_name => "Bug 911385: ptc works with --resume + --ignore-database"
);
$dbh->do("CREATE DATABASE zakila");
$dbh->do("CREATE TABLE zakila.bug_911385 (i int)");
test_so(
filters => ['--ignore-databases', 'sakila,mysql'],
result => "zakila.bug_911385 ",
resume => 'sakila.payment',
test_name => "Bug 911385: ...and continues to the next db"
);
$dbh->do("DROP DATABASE zakila");
test_so(
filters => [qw(--ignore-tables-regex payment --ignore-databases mysql)],
result => "",
lives_ok => 1,
resume => 'sakila.payment',
test_name => "Bug 911385: ptc works with --resume + --ignore-tables-regex"
);
test_so(
filters => [qw(--ignore-tables-regex payment --ignore-databases mysql)],
result => "sakila.rental sakila.staff sakila.store ",
resume => 'sakila.payment',
test_name => "Bug 911385: ...and continues to the next table"
);
# #############################################################################
# Bug 1047335: pt-duplicate-key-checker fails when it encounters a crashed table
# https://bugs.launchpad.net/percona-toolkit/+bug/1047335
@@ -510,3 +553,4 @@ diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit;