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

Fix for 911385: pt-table-checksum v2 fails when --resume + --ignore-database is used

Browse Source
This commit is contained in:
Brian Fraser
2012-11-08 13:42:29 -03:00
parent fb345eb3fd
commit 426d599566
3 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/pt-table-checksum
View File

@@ -5281,7 +5281,7 @@ sub _get_hash_func {
}
my ($dbh) = @args{@required_args};
my $o = $self->{OptionParser};
my @funcs = qw(CRC32 FNV1A_64 FNV_64 MD5 SHA1);
my @funcs = qw(CRC32 FNV1A_64 FNV_64 MURMUR_HASH MD5 SHA1);
if ( my $func = $o->get('function') ) {
unshift @funcs, $func;
@@ -5302,7 +5302,7 @@ sub _get_hash_func {
PTDEBUG && _d('Chosen hash func:', $result);
return $func;
}
die $error || 'No hash functions (CRC32, MD5, etc.) are available';
die($error || 'No hash functions (CRC32, MD5, etc.) are available');
}
sub _get_crc_width {
@@ -6782,9 +6782,10 @@ sub _iterate_dbh {
}
if ( !$self->{db} ) {
do {
while ( @{$self->{dbs}} ) {
$self->{db} = shift @{$self->{dbs}};
} until $self->_resume_from_database($self->{db});
last if $self->_resume_from_database($self->{db});
}
PTDEBUG && _d('Next database:', $self->{db});
return unless $self->{db};
}