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

Print/save fk errors only if there is one. Fix example --dest table (bug 1075775).

Browse Source
This commit is contained in:
Daniel Nichter
2012-11-07 11:38:09 -07:00
parent e11a7eea41
commit 091d9cf66d
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bin/pt-fk-error-logger
View File

@@ -3534,20 +3534,23 @@ sub main {
{
my $text = $dbh->selectrow_hashref("SHOW /*!40100 ENGINE*/ INNODB STATUS")->{Status};
my ($ts, $fk_error) = get_fk_error($text);
PTDEBUG && _d('ts:', $ts, 'fk error:', $fk_error);
# Save and/or print the foreign key error.
if ( $ins_sth ) {
my $fk_ts = parse_timestamp($ts);
PTDEBUG && _d('Saving fk error', $ts, $fk_error);
eval {
$ins_sth->execute($fk_ts, $fk_error);
};
if ( $EVAL_ERROR ) {
warn $EVAL_ERROR;
PTDEBUG && _d($EVAL_ERROR);
if ( $ts && $fk_error ) {
# Save and/or print the foreign key error.
if ( $ins_sth ) {
my $fk_ts = parse_timestamp($ts);
PTDEBUG && _d('Saving fk error', $ts, $fk_error);
eval {
$ins_sth->execute($fk_ts, $fk_error);
};
if ( $EVAL_ERROR ) {
warn $EVAL_ERROR;
PTDEBUG && _d($EVAL_ERROR);
}
}
print "$ts $fk_error\n\n" if $o->get('print') || !$o->got('dest');
}
print "$ts $fk_error\n\n" if $o->get('print') || !$o->got('dest');
# If there's an --interval argument, run forever or till specified.
# Otherwise just run once.
@@ -3727,7 +3730,7 @@ The following table is suggested:
CREATE TABLE foreign_key_errors (
ts datetime NOT NULL,
error text NOT NULL,
PRIMARY KEY (ts),
PRIMARY KEY (ts)
)
The only information saved is the timestamp and the foreign key error text.

2
t/pt-fk-error-logger/basics.t
View File

@@ -136,7 +136,7 @@ $output = output(
is(
$output,
"",
"No foreign key errors, no errors and no output (bug 1075773)"
"No foreign key errors, no errors, no output (bug 1075773)"
);
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);