Merge lp:~percona-toolkit-dev/percona-toolkit/pt-deadlock-logger-logs-incorrect-ts-1295667 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.8

[Daniel Nichter]

[lp:~percona-toolkit-dev/percona-toolkit/pt-deadlock-logger-logs-incorrect-ts-1295667]

600. By Daniel Nichter on 2014-05-30

Add DEFAULT CURRENT_TIMESTAMP to deadlocks table to prevent ON UPDATE DEFAULT CURRENT_TIMESTAMP.

601. By Daniel Nichter on 2014-05-30

Add trailing comma.

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2014-02-20 08:10:16 +0000
+++ bin/pt-deadlock-logger	2014-05-30 00:44:48 +0000
@@ -4440,12 +4440,27 @@
 
    my $dst;
    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(
          dsn          => $dst_dsn,
          prev_dsn     => ($src ? $src->dsn : undef),
          parent       => $o->get('daemonize'),
          DSNParser    => $dp,
          OptionParser => $o,
+         set          => $set_tz,
       );
    }
 
@@ -5199,7 +5214,7 @@
 
  CREATE TABLE deadlocks (
    server char(20) NOT NULL,
-   ts datetime NOT NULL,
+   ts timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
    thread int unsigned NOT NULL,
    txn_id bigint unsigned NOT NULL,
    txn_time smallint unsigned NOT NULL,