Merge lp:~percona-toolkit-dev/percona-toolkit/fix-ptc-ts-col-bug-1163735 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2013-06-25 23:30:23 +0000
+++ bin/pt-table-checksum	2013-06-26 01:32:25 +0000
@@ -12042,7 +12042,7 @@
      this_cnt       int          NOT NULL,
      master_crc     char(40)         NULL,
      master_cnt     int              NULL,
-     ts             timestamp    NOT NULL,
+     ts             timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
      PRIMARY KEY (db, tbl, chunk),
      INDEX ts_db_tbl (ts, db, tbl)
   ) ENGINE=InnoDB;

=== modified file 'sandbox/start-sandbox'
--- sandbox/start-sandbox	2013-04-12 15:58:10 +0000
+++ sandbox/start-sandbox	2013-06-26 01:32:25 +0000
@@ -113,6 +113,10 @@
       echo "query_cache_size=$QUERY_CACHE_SIZE" >> /tmp/$port/my.sandbox.cnf
    fi
 
+   if [ -n "$EXTRA_DEFAULTS_FILE" ]; then
+      cat "$EXTRA_DEFAULTS_FILE" >> /tmp/$port/my.sandbox.cnf
+   fi
+
    # If the sandbox is a slave, set it read_only.
    if [ "$type" = "slave" ]; then
       echo "read_only" >> /tmp/$port/my.sandbox.cnf

=== modified file 't/pt-table-checksum/create_replicate_table.t'
--- t/pt-table-checksum/create_replicate_table.t	2013-03-02 02:02:13 +0000
+++ t/pt-table-checksum/create_replicate_table.t	2013-06-26 01:32:25 +0000
@@ -80,7 +80,7 @@
   this_cnt       int          NOT NULL,
   master_crc     char(40)         NULL,
   master_cnt     int              NULL,
-  ts             timestamp    NOT NULL,
+  ts             timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (db, tbl, chunk)
 ) ENGINE=InnoDB;";
 

=== modified file 't/pt-table-checksum/samples/checksum_tbl_truncated.sql'
--- t/pt-table-checksum/samples/checksum_tbl_truncated.sql	2011-10-13 18:46:44 +0000
+++ t/pt-table-checksum/samples/checksum_tbl_truncated.sql	2013-06-26 01:32:25 +0000
@@ -12,6 +12,6 @@
   this_cnt       int          NOT NULL,
   master_crc     char(40)         NULL,
   master_cnt     int              NULL,
-  ts             timestamp    NOT NULL,
+  ts             timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (db, tbl, chunk)
 ) ENGINE=InnoDB;

=== added file 't/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf'
--- t/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf	1970-01-01 00:00:00 +0000
+++ t/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf	2013-06-26 01:32:25 +0000
@@ -0,0 +1,1 @@
+explicit_defaults_for_timestamp=ON

=== added file 't/pt-table-checksum/settings.t'
--- t/pt-table-checksum/settings.t	1970-01-01 00:00:00 +0000
+++ t/pt-table-checksum/settings.t	2013-06-26 01:32:25 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/env perl
+
+BEGIN {
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-table-checksum";
+
+if ( $sandbox_version lt '5.6' ) {
+   plan skip_all => 'Tests for MySQL 5.6';
+}
+
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+diag(`EXTRA_DEFAULTS_FILE="$trunk/t/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf" $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('master1');
+
+if ( !$master_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox master 12348';
+}
+
+my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
+my @args       = ($master_dsn, '--max-load', ''); 
+my $output;
+my $retval;
+
+$output = output(
+   sub { $retval = pt_table_checksum::main(@args, qw(-t mysql.user)) },
+   stderr => 1,
+);
+
+unlike(
+   $output,
+   qr/error 1364/i,
+   "explicit_defaults_for_timestamp (bug 1163735): no error"
+);
+
+# Exit will be non-zero because of "Diffs cannot be detected because
+# no slaves were found."
+
+# #############################################################################
+# Done.
+# #############################################################################
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;