percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-28 17:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add QUERY_CACHE_SIZE to start-sandbox. Make t/pt-upgrade/warnings.t use 12349 instead of 12348, and start it with QUERY_CACHE_SIZE explicitly so MySQL 5.6.8 works.

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-05 10:52:12 -07:00
parent 9fc08fd411
commit a672a1d98d
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
t/pt-upgrade/warnings.t
View File

@@ -15,38 +15,36 @@ use PerconaTest;
use Sandbox;
require "$trunk/bin/pt-upgrade";
# This runs immediately if the server is already running, else it starts it.
diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox master 12349 >/dev/null`);
diag(`QUERY_CACHE_SIZE=1048576 $trunk/sandbox/start-sandbox master 12349 >/dev/null`);
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh1 = $sb->get_dbh_for('master');
my $dbh2 = $sb->get_dbh_for('master1');
my $dbh2 = $sb->get_dbh_for('master2');
if ( !$dbh1 ) {
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
plan skip_all => 'Cannot connect to sandbox master';
}
elsif ( !$dbh2 ) {
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox master 12349 >/dev/null`);
plan skip_all => 'Cannot connect to second sandbox master';
}
$sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql');
$sb->load_file('master1', 't/pt-upgrade/samples/001/tables.sql');
$sb->load_file('master2', 't/pt-upgrade/samples/001/tables.sql');
my $output;
my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox,L=1 P=12348 --compare results,warnings --zero-query-times --compare-results-method rows --limit 10";
my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox,L=1 P=12349 --compare results,warnings --zero-query-times --compare-results-method rows --limit 10";
# This test really deals with,
# http://code.google.com/p/maatkit/issues/detail?id=754
# http://bugs.mysql.com/bug.php?id=49634
$dbh2->do('set global query_cache_size=1000000');
my $qc = $dbh2->selectrow_arrayref("show variables like 'query_cache_size'")->[1];
ok(
$qc > 999000,
is(
$qc,
1048576,
'Query size'
);
@@ -62,7 +60,7 @@ diag(`$cmd $trunk/t/pt-upgrade/samples/001/one-error.log >/dev/null 2>&1`);
$output = `$cmd $trunk/t/pt-upgrade/samples/001/one-error.log`;
like(
$output,
qr/# 3B323396273BC4C7-1 127.1:12348 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
qr/# 3B323396273BC4C7-1 127.1:12349 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
'--clear-warnings',
);
@@ -78,22 +76,15 @@ like(
$output = `$cmd --no-clear-warnings $trunk/t/pt-upgrade/samples/001/one-error.log`;
like(
$output,
qr/# 3B323396273BC4C7-1 127.1:12348 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
qr/# 3B323396273BC4C7-1 127.1:12349 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
'--no-clear-warnings'
);
$dbh2->do('set global query_cache_size=0');
$qc = $dbh2->selectrow_arrayref("show variables like 'query_cache_size'")->[1];
ok(
$qc == 0,
'Query size'
);
# #############################################################################
# Done.
# #############################################################################
diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
$sb->wipe_clean($dbh1);
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit;