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

fixes pt-deadlock-logger logging incorrect ts - issue 1295667

Browse Source
This commit is contained in:
Frank Cizmich
2014-05-29 17:54:15 -03:00
parent 72fab9ad8f
commit 9c15cef84f
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/pt-deadlock-logger
View File

@@ -4440,12 +4440,27 @@ sub main {
my $dst; my $dst;
if ( my $dst_dsn = $o->get('dest') ) { if ( my $dst_dsn = $o->get('dest') ) {
# set time_zone = SYSTEM , addresses https://bugs.launchpad.net/percona-toolkit/+bug/1295667
my $set_tz = sub {
my ($dbh) = @_;
my $sql = "SET time_zone=SYSTEM /* pt-deadlock-logger */";
eval {
PTDEBUG && _d($dbh, $sql);
$dbh->do($sql);
};
if ( $EVAL_ERROR ) {
die "Failed to $sql: $EVAL_ERROR\n";
}
};
$dst = Cxn->new( $dst = Cxn->new(
dsn => $dst_dsn, dsn => $dst_dsn,
prev_dsn => ($src ? $src->dsn : undef), prev_dsn => ($src ? $src->dsn : undef),
parent => $o->get('daemonize'), parent => $o->get('daemonize'),
DSNParser => $dp, DSNParser => $dp,
OptionParser => $o, OptionParser => $o,
set => $set_tz
); );
} }
@@ -5199,7 +5214,7 @@ MAGIC_dest_table
CREATE TABLE deadlocks ( CREATE TABLE deadlocks (
server char(20) NOT NULL, server char(20) NOT NULL,
ts datetime NOT NULL, ts timestamp NOT NULL,
thread int unsigned NOT NULL, thread int unsigned NOT NULL,
txn_id bigint unsigned NOT NULL, txn_id bigint unsigned NOT NULL,
txn_time smallint unsigned NOT NULL, txn_time smallint unsigned NOT NULL,