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

Fix call to undefined get() by removing it and simplifying the warning message.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-26 13:28:27 -07:00
parent def86634f8
commit 8584f3b734
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10285,22 +10285,14 @@ sub exec_nibble {
|| $message =~ m/$warn_code{$code}->{pattern}/) )
{
if ( !$stats->{"mysql_warning_$code"}++ ) { # warn once
my $err
= "Copying rows caused a MySQL error $code: "
warn "Copying rows caused a MySQL error $code: "
. ($warn_code{$code}->{message}
? $warn_code{$code}->{message}
: $message)
. "\nThis MySQL error is being ignored ";
if ( get('statistics') ) {
$err .= "but further occurrences will be reported "
. "by --statistics when the tool finishes.\n";
}
else {
$err .= "and further occurrences will not be reported. "
. "Specify --statistics to see a count of all "
. "suppressed warnings and errors.\n";
}
warn $err;
. "\nNo more warnings about this MySQL error will be "
. "reported. If --statistics was specified, "
. "mysql_warning_$code will list the total count of "
. "this MySQL error.\n";
}
}
else {

6
t/pt-online-schema-change/bugs.t
View File

@@ -363,6 +363,12 @@ unlike(
"Bug 1188264: no undefined subroutine"
);
like(
$output,
qr/error 1265/, # Data truncated for column 'c' at row 21
"Bug 1188264: warning about expected MySQL error 1265"
);
# #############################################################################
# Done.
# #############################################################################