Fix t/lib/Percona/XtraDB/Cluster-no-PXC.t.

This commit is contained in:
Daniel Nichter
2013-03-02 13:19:42 -07:00
parent 1b95fee620
commit 882defb1cc

View File

@@ -43,10 +43,22 @@ elsif ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
}
my $o = new OptionParser(description => 'Cxn');
my $o = new OptionParser(
description => 'Cxn',
file => "$trunk/bin/pt-table-checksum",
);
$o->get_specs("$trunk/bin/pt-table-checksum");
$o->get_opts();
$dp->prop('set-vars', $o->get('set-vars'));
# In 2.1, these tests did not set innodb_lock_wait_timeout because
# it was not a --set-vars default but rather its own option handled
# by/in the tool. In 2.2, the var is a --set-vars default, which
# means it will cause a warning on 5.0 and 5.1, so we remoe the var
# to remove the warning.
my $set_vars = $o->set_vars();
delete $set_vars->{innodb_lock_wait_timeout};
delete $set_vars->{lock_wait_timeout};
$dp->prop('set-vars', $set_vars);
sub make_cxn {
my (%args) = @_;