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

Removed leftover junk from a different branch

Browse Source
This commit is contained in:
Brian Fraser
2012-11-02 03:08:57 -03:00
parent d5a3a6e59c
commit e778a0900c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pt-online-schema-change
View File

@@ -9087,8 +9087,6 @@ sub exec_nibble {
}, },
); );
my %stats;
return $retry->retry( return $retry->retry(
tries => $o->get('retries'), tries => $o->get('retries'),
wait => sub { sleep 0.25; return; }, wait => sub { sleep 0.25; return; },
@@ -9124,7 +9122,6 @@ sub exec_nibble {
my $code = ($warning->{code} || 0); my $code = ($warning->{code} || 0);
my $message = $warning->{message}; my $message = $warning->{message};
if ( $ignore_code{$code} ) { if ( $ignore_code{$code} ) {
push @{$stats{ignored_code}->{$code} ||= []}, $message;
PTDEBUG && _d('Ignoring warning:', $code, $message); PTDEBUG && _d('Ignoring warning:', $code, $message);
next; next;
} }
@@ -9132,16 +9129,15 @@ sub exec_nibble {
&& (!$warn_code{$code}->{pattern} && (!$warn_code{$code}->{pattern}
|| $message =~ m/$warn_code{$code}->{pattern}/) ) || $message =~ m/$warn_code{$code}->{pattern}/) )
{ {
if ( !$stats{warned_code}->{$code} ) { # warn once per table if ( !$tbl->{"warned_code_$code"} ) { # warn once per table
warn "Copying rows caused a MySQL error $code: " warn "Copying rows caused a MySQL error $code: "
. ($warn_code{$code}->{message} . ($warn_code{$code}->{message}
? $warn_code{$code}->{message} ? $warn_code{$code}->{message}
: $message) : $message)
. "\nThis MySQL error is being ignored and further " . "\nThis MySQL error is being ignored and further "
. "occurrences of it will not be reported.\n"; . "occurrences of it will not be reported.\n";
$tbl->{"warned_code_$code"} = 1;
} }
push @{$stats{warned_code}->{$code} ||= []},
$warn_code{$code}->{message} || $message;
} }
else { else {
# This die will propagate to fail which will return 0 # This die will propagate to fail which will return 0