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

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

View File

@@ -439,7 +439,7 @@ SKIP: {
$dbh->disconnect();
$dp = new DSNParser(opts => $opts);
$dp->prop('set-vars', 'wait_timeout=1000');
$dp->prop('set-vars', { wait_timeout => { val => 1000, default => 1}});
$d = $dp->parse('h=127.0.0.1,P=12345,A=utf8,u=msandbox,p=msandbox');
my $dbh2 = $dp->get_dbh($dp->get_cxn_params($d), {mysql_use_result=>1});
sleep 2;
@@ -560,7 +560,7 @@ like(
"get_dbh dies with an unknown charset"
);
$dp->prop('set-vars', "time_zoen='UTC'");
$dp->prop('set-vars', { time_zoen => { val => 'UTC' }});
($out, undef) = full_output(sub { $dp->get_dbh($dp->get_cxn_params($dsn), {}) });
like(
@@ -575,7 +575,7 @@ $dp->prop('set-vars', undef);
# https://bugs.launchpad.net/percona-toolkit/+bug/1078887
# #############################################################################
$dp->prop('set-vars', "sql_mode=ANSI_QUOTES");
$dp->prop('set-vars', { sql_mode => { val=>'ANSI_QUOTES' }});
my $sql_mode_dbh = $dp->get_dbh($dp->get_cxn_params($dsn), {});
my (undef, $sql_mode) = $sql_mode_dbh->selectrow_array(q{SHOW VARIABLES LIKE 'sql\_mode'});
@@ -628,4 +628,4 @@ SKIP: {
# Done.
# #############################################################################
done_testing;