percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-19 17:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

PerconaTest: Add load_data_is_disabled and correct full_output

Browse Source 
load_data_is_disabled checks if LOAD DATA LOCAL INFILE is disabled;
it'll be used in the future by a couple of tests.
  
full_output was changed to use two different filehandles for STDOUT
and STDERR; THis is because otherwise, code closing STDOUT (like
the --quiet option in pt-osc) would also accidentally close STDERR.
This commit is contained in:
Brian Fraser
2012-07-11 17:29:04 -03:00
parent c00598d3fb
commit 9ae940cd76
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/PerconaTest.pm
View File

@@ -717,12 +717,17 @@ sub full_output {
my ( $code, %args ) = @_; my ( $code, %args ) = @_;
die "I need a code argument" unless $code; die "I need a code argument" unless $code;
my (undef, $file) = tempfile(); local (*STDOUT, *STDERR);
open *output_fh, '>', $file require IO::File;
or die "Cannot open file $file: $OS_ERROR";
local *STDOUT = *output_fh;
*STDERR = *STDOUT; my (undef, $file) = tempfile();
open *STDOUT, '>', $file
or die "Cannot open file $file: $OS_ERROR";
*STDOUT->autoflush(1);
open *STDERR, '>', $file
or die "Cannot open file $file: $OS_ERROR";
*STDERR->autoflush(1);
my $status; my $status;
if (my $pid = fork) { if (my $pid = fork) {
@@ -745,7 +750,7 @@ sub full_output {
else { else {
exit $code->(); exit $code->();
} }
close *output_fh; close $_ or die "Cannot close $_: $OS_ERROR" for qw(STDOUT STDERR);
my $output = do { local $/; open my $fh, "<", $file or die $!; <$fh> }; my $output = do { local $/; open my $fh, "<", $file or die $!; <$fh> };
return ($output, $status); return ($output, $status);
@@ -772,6 +777,19 @@ sub tables_used {
return [ sort keys %tables ]; return [ sort keys %tables ];
} }
sub load_data_is_disabled {
my ($dbh) = @_;
my $sql = "LOAD DATA LOCAL INFILE '/dev/null' INTO TABLE "
. "`t`.`pt_not_there`";
local $@;
if (!eval { $dbh->do($sql); 1 } ) {
my $e = $@;
return 1 if $e =~ qr/\QDBD::mysql::db do failed: The used command is not allowed with this MySQL version [for Statement "LOAD DATA LOCAL INFILE/;
}
return;
}
1; 1;
} }
# ########################################################################### # ###########################################################################