Merge 2.1 at r473.

This commit is contained in:
Daniel Nichter
2012-11-30 00:23:42 +00:00
85 changed files with 1713 additions and 500 deletions

View File

@@ -21,9 +21,6 @@ use Data::Dumper;
use PerconaTest;
use Sandbox;
# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -21,9 +21,6 @@ use Data::Dumper;
use PerconaTest;
use Sandbox;
# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);
@@ -175,6 +172,23 @@ is(
"Bug 1030031 (wrong DIFFS): 3 diffs"
);
# #############################################################################
# pt-table-checksum does't ignore tables for --replicate-check-only
# https://bugs.launchpad.net/percona-toolkit/+bug/1074179
# #############################################################################
$output = output(
sub { pt_table_checksum::main(@args, qw(--replicate-check-only --ignore-tables-regex=t)) },
stderr => 1,
);
chomp($output);
is(
$output,
'',
"Bug 1074179: ignore-tables-regex works with --replicate-check-only"
);
# #############################################################################
# pt-table-checksum can crash with --columns if none match
# https://bugs.launchpad.net/percona-toolkit/+bug/1016131

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -15,8 +15,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -14,8 +14,6 @@ use Test::More;
use Data::Dumper;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $output;

View File

@@ -22,8 +22,6 @@ use PerconaTest;
use Sandbox;
# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -19,8 +19,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -24,8 +24,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
use Data::Dumper;

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -18,8 +18,6 @@ $Data::Dumper::Quotekeys = 0;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -10,7 +10,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
0 0 0 0 mysql.host
0 0 0 0 mysql.ndb_binlog_index
0 0 0 0 mysql.plugin
0 0 6 0 mysql.proc
0 0 0 0 mysql.proc
0 0 0 0 mysql.procs_priv
0 0 0 0 mysql.servers
0 0 0 0 mysql.tables_priv

View File

@@ -10,7 +10,7 @@ ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
0 0 0 1 0 mysql.host
0 0 0 1 0 mysql.ndb_binlog_index
0 0 0 1 0 mysql.plugin
0 0 6 1 0 mysql.proc
0 0 0 1 0 mysql.proc
0 0 0 1 0 mysql.procs_priv
0 0 0 1 0 mysql.servers
0 0 0 1 0 mysql.tables_priv

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349");

View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

View File

@@ -19,8 +19,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);