percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-15 01:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update modules and remove the $can_local_infile skips

Browse Source
This commit is contained in:
Brian Fraser
2012-08-30 23:46:33 -03:00
parent 8654ac0819
commit a433fa7d1c
8 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-archiver
View File

@@ -2142,7 +2142,7 @@ sub get_cxn_params {
. join(';', map { "$opts{$_}->{dsn}=$info->{$_}" } . join(';', map { "$opts{$_}->{dsn}=$info->{$_}" }
grep { defined $info->{$_} } grep { defined $info->{$_} }
qw(F h P S A)) qw(F h P S A))
. ';mysql_read_default_group=client'; . ';mysql_read_default_group=client;mysql_local_infile=1';
} }
PTDEBUG && _d($dsn); PTDEBUG && _d($dsn);
return ($dsn, $info->{u}, $info->{p}); return ($dsn, $info->{u}, $info->{p});
@@ -4837,7 +4837,7 @@ sub encode_client_response {
next unless exists $versions->{$item}; next unless exists $versions->{$item};
if ( ref($versions->{$item}) eq 'HASH' ) { if ( ref($versions->{$item}) eq 'HASH' ) {
my $mysql_versions = $versions->{$item}; my $mysql_versions = $versions->{$item};
for my $id ( keys %$mysql_versions ) { for my $id ( sort keys %$mysql_versions ) {
push @lines, join(';', $id, $item, $mysql_versions->{$id}); push @lines, join(';', $id, $item, $mysql_versions->{$id});
} }
} }

4
bin/pt-upgrade
View File

@@ -245,7 +245,7 @@ sub get_cxn_params {
. join(';', map { "$opts{$_}->{dsn}=$info->{$_}" } . join(';', map { "$opts{$_}->{dsn}=$info->{$_}" }
grep { defined $info->{$_} } grep { defined $info->{$_} }
qw(F h P S A)) qw(F h P S A))
. ';mysql_read_default_group=client'; . ';mysql_read_default_group=client;mysql_local_infile=1';
} }
PTDEBUG && _d($dsn); PTDEBUG && _d($dsn);
return ($dsn, $info->{u}, $info->{p}); return ($dsn, $info->{u}, $info->{p});
@@ -11334,7 +11334,7 @@ sub encode_client_response {
next unless exists $versions->{$item}; next unless exists $versions->{$item};
if ( ref($versions->{$item}) eq 'HASH' ) { if ( ref($versions->{$item}) eq 'HASH' ) {
my $mysql_versions = $versions->{$item}; my $mysql_versions = $versions->{$item};
for my $id ( keys %$mysql_versions ) { for my $id ( sort keys %$mysql_versions ) {
push @lines, join(';', $id, $item, $mysql_versions->{$id}); push @lines, join(';', $id, $item, $mysql_versions->{$id});
} }
} }

2
t/lib/CompareResults.t
View File

@@ -303,7 +303,6 @@ is_deeply(
# ############################################################################# # #############################################################################
my $tmpdir = '/tmp/mk-upgrade-res'; my $tmpdir = '/tmp/mk-upgrade-res';
SKIP: { SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled", 30 unless $can_load_data;
diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`); diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
@@ -727,7 +726,6 @@ is_deeply(
); );
SKIP: { SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
$cr = new CompareResults( $cr = new CompareResults(
method => 'rows', method => 'rows',

1
t/pt-archiver/basics.t
View File

@@ -186,7 +186,6 @@ cmp_ok(
# Bug 903387: pt-archiver doesn't honor b=1 flag to create SQL_LOG_BIN statement # Bug 903387: pt-archiver doesn't honor b=1 flag to create SQL_LOG_BIN statement
# ############################################################################# # #############################################################################
SKIP: { SKIP: {
skip('LOAD DATA LOCAL INFILE is disabled', 3) if !$can_load_data;
$sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql"); $sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql");
$sb->wait_for_slaves(); $sb->wait_for_slaves();

3
t/pt-archiver/bulk_insert.t
View File

@@ -22,9 +22,6 @@ my $dbh = $sb->get_dbh_for('master');
if ( !$dbh ) { if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
elsif ( !$can_load_data ) {
plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
}
my $output; my $output;
my $rows; my $rows;

3
t/pt-archiver/bulk_regular_insert.t
View File

@@ -22,9 +22,6 @@ my $dbh = $sb->get_dbh_for('master');
if ( !$dbh ) { if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
elsif ( !$can_load_data ) {
plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
}
my $output; my $output;
my $cnf = "/tmp/12345/my.sandbox.cnf"; my $cnf = "/tmp/12345/my.sandbox.cnf";

4
t/pt-upgrade/basics.t
View File

@@ -61,9 +61,6 @@ ok(
'Report for multiple queries (checksum method)' 'Report for multiple queries (checksum method)'
); );
SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
ok( ok(
no_diff( no_diff(
sub { pt_upgrade::main(@args, "$trunk/$sample/001/select-one.log", sub { pt_upgrade::main(@args, "$trunk/$sample/001/select-one.log",
@@ -81,7 +78,6 @@ SKIP: {
), ),
'Report for multiple queries (rows method)' 'Report for multiple queries (rows method)'
); );
}
ok( ok(
no_diff( no_diff(

7
t/pt-upgrade/warnings.t
View File

@@ -15,13 +15,6 @@ use PerconaTest;
use Sandbox; use Sandbox;
require "$trunk/bin/pt-upgrade"; require "$trunk/bin/pt-upgrade";
# This test calls pt-upgrade with --compare-results-method rows
# which use LOAD DATA LOCAL INFILE. If LOAD DATA is disabled,
# then this this test can't run.
if ( !$can_load_data ) {
plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
}
# This runs immediately if the server is already running, else it starts it. # This runs immediately if the server is already running, else it starts it.
diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`); diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);