percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-12-23 02:00:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

pt-fk-error-logger: Deal with 5.6 InnoDB timestamps

Browse Source
This commit is contained in:
Brian Fraser
2012-12-20 13:55:12 -03:00
parent 7539c3a8fb
commit bae4ce1ce9
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1942,6 +1942,9 @@ sub parse_timestamp {
. (defined $f ? '%09.6f' : '%02d'), . (defined $f ? '%09.6f' : '%02d'),
$y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s); $y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
} }
elsif ( $val =~ m/^$proper_ts$/ ) {
return $val;
}
return $val; return $val;
} }
@@ -3609,7 +3612,8 @@ sub get_fk_error {
# Quick check if text even has a foreign key error. # Quick check if text even has a foreign key error.
return unless $text =~ m/LATEST FOREIGN KEY ERROR/; return unless $text =~ m/LATEST FOREIGN KEY ERROR/;
my $idb_ts = qr/(\d{6} .\d:\d\d:\d\d)/; # InnoDB timestamp # InnoDB timestamp
my $idb_ts = qr/((?:\d{6}|\d{4}-\d\d-\d\d) .\d:\d\d:\d\d)/;
my ($ts, $fke) = $text =~ m/LATEST FOREIGN KEY ERROR.+?$idb_ts\s*(.+?)---/ms; my ($ts, $fke) = $text =~ m/LATEST FOREIGN KEY ERROR.+?$idb_ts\s*(.+?)---/ms;
chomp $fke if $fke; chomp $fke if $fke;

4
lib/Transformers.pm
View File

@@ -193,6 +193,10 @@ sub parse_timestamp {
. (defined $f ? '%09.6f' : '%02d'), . (defined $f ? '%09.6f' : '%02d'),
$y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s); $y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
} }
# MySQL 5.6+ uses "proper" timestamps
elsif ( $val =~ m/^$proper_ts$/ ) {
return $val;
}
return $val; return $val;
} }