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

Remove --lock-wait-timeout from pt-table-checksum; make innodb_lock_waitout=1 a --set-vars default. Update all the ptc tests.

Browse Source
This commit is contained in:
Daniel Nichter
2013-03-01 19:02:13 -07:00
parent ad7207139c
commit 1d42a09196
25 changed files with 60 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/pt-table-checksum/error_handling.t
View File

@@ -30,10 +30,10 @@ elsif ( !$slave1_dbh ) {
}
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --lock-wait-timeout=3 else the tool will die.
# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the tool will die.
# And --max-load "" prevents waiting for status variables.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = ($master_dsn, qw(--lock-wait-timeout 3), '--max-load', '');
my @args = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', '');
my $output;
my $exit_status;
@@ -189,7 +189,7 @@ $sb->wait_for_slaves;
$output = output(
sub { $exit_status = pt_table_checksum::main(
"h=127.1,u=ro_checksum_user,p=msandbox,P=12345",
qw(--lock-wait-timeout 3 -t mysql.user)) },
qw(--set-vars innodb_lock_wait_timeout=3 -t mysql.user)) },
stderr => 1,
);