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

Fix tests to work with new --set-vars, and change --lock-wait-timeout to --set-vars innodb_lock_wait_timeout in tests.

Browse Source
This commit is contained in:
Daniel Nichter
2013-03-02 10:17:23 -07:00
parent 1d42a09196
commit f0b7712528
16 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
t/pt-online-schema-change/ansi_quotes.t
View File

@@ -29,7 +29,8 @@ if ( !$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.
my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $output;

3
t/pt-online-schema-change/bugs.t
View File

@@ -30,7 +30,8 @@ elsif ( !$slave_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.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $output;

3
t/pt-online-schema-change/check_alter.t
View File

@@ -30,7 +30,8 @@ elsif ( !$slave_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.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $output;

3
t/pt-online-schema-change/privs.t
View File

@@ -40,7 +40,8 @@ elsif ( !@{$master_dbh->selectall_arrayref("show databases like 'sakila'")} ) {
}
# 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.
my $master_dsn = 'h=127.1,P=12345,p=msandbox';
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $row;

2
t/pt-online-schema-change/pxc.t
View File

@@ -46,8 +46,6 @@ if ( $db_flavor !~ /XtraDB Cluster/ ) {
plan skip_all => "PXC tests";
}
# 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.
my $node1_dsn = $sb->dsn_for('node1');
my $output;
my $exit;

3
t/pt-online-schema-change/rename_columns.t
View File

@@ -30,7 +30,8 @@ elsif ( !$slave_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.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $output;