mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-22 11:54:54 +00:00
Removed the L option from the dsn_opts exported by PerconaTest, as it was useless and breaking tests, and added an L=1 to a leftover pt-archiver --bulk-insert call
This commit is contained in:
@@ -218,7 +218,7 @@ is_deeply (
|
||||
{ S => 'bar', h => 'host' } ))
|
||||
],
|
||||
[
|
||||
'DBI:mysql:foo;host=me;mysql_socket=bar;mysql_read_default_group=client;mysql_local_infile=1',
|
||||
'DBI:mysql:foo;host=me;mysql_socket=bar;mysql_read_default_group=client',
|
||||
'a',
|
||||
'b',
|
||||
],
|
||||
@@ -234,7 +234,7 @@ is_deeply (
|
||||
{ S => 'bar', h => 'host' } ))
|
||||
],
|
||||
[
|
||||
'DBI:mysql:foo;host=me;mysql_socket=bar;charset=foo;mysql_read_default_group=client;mysql_local_infile=1',
|
||||
'DBI:mysql:foo;host=me;mysql_socket=bar;charset=foo;mysql_read_default_group=client',
|
||||
'a',
|
||||
'b',
|
||||
],
|
||||
@@ -577,6 +577,7 @@ $dp->prop('set-vars', undef);
|
||||
|
||||
SKIP: {
|
||||
skip "LOAD DATA LOCAL INFILE already works here", 1 if $can_load_data;
|
||||
local $dsn->{L} = 1;
|
||||
my $dbh = $dp->get_dbh( $dp->get_cxn_params( $dsn ) );
|
||||
|
||||
use File::Temp qw(tempfile);
|
||||
@@ -596,7 +597,7 @@ SKIP: {
|
||||
is(
|
||||
$EVAL_ERROR,
|
||||
'',
|
||||
"Even though LOCAL INFILE is off by default, the dbhs returned by DSNParser can use it"
|
||||
"Even though LOCAL INFILE is off by default, the dbhs returned by DSNParser can use it if L => 1"
|
||||
);
|
||||
|
||||
unlink $filename;
|
||||
|
@@ -1745,6 +1745,7 @@ is_deeply(
|
||||
p => 'foo',
|
||||
t => undef,
|
||||
u => 'bob',
|
||||
L => undef,
|
||||
},
|
||||
'DSN opt gets missing vals from --host, --port, etc. (issue 248)',
|
||||
);
|
||||
@@ -1774,6 +1775,7 @@ is_deeply(
|
||||
p => undef,
|
||||
t => undef,
|
||||
u => 'bob',
|
||||
L => undef,
|
||||
},
|
||||
'Vals from "defaults to" DSN take precedence over defaults (issue 248)'
|
||||
);
|
||||
|
@@ -207,7 +207,7 @@ SKIP: {
|
||||
|
||||
$output = output(
|
||||
sub { pt_archiver::main(
|
||||
'--source', "D=bri,t=t,F=$cnf,b=1",
|
||||
'--source', "D=bri,L=1,t=t,F=$cnf,b=1",
|
||||
'--dest', "D=bri,t=t_arch",
|
||||
qw(--where 1=1 --replace --commit-each --bulk-insert --bulk-delete),
|
||||
qw(--limit 10)) },
|
||||
|
Reference in New Issue
Block a user