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

Merge fix-ptc-ts-col-bug-1163735.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-25 18:57:30 -07:00
parent 88ca03473c 70f5c17bc4
commit 43ebd47263
6 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-table-checksum
View File

@@ -12042,7 +12042,7 @@ structure (MAGIC_create_replicate):
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;

4
sandbox/start-sandbox
View File

@@ -113,6 +113,10 @@ make_sandbox() {
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

2
t/pt-table-checksum/create_replicate_table.t
View File

@@ -80,7 +80,7 @@ my $create_repl_table =
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;";

2
t/pt-table-checksum/samples/checksum_tbl_truncated.sql
View File

@@ -12,6 +12,6 @@ CREATE TABLE truncated_checksums (
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;

1
t/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf Normal file
View File

@@ -0,0 +1 @@
explicit_defaults_for_timestamp=ON

57
t/pt-table-checksum/settings.t Normal file
View File

@@ -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;