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

Merge fix-1009510-1039569-ptc-check-table-on-replicas

Browse Source
This commit is contained in:
Daniel Nichter
2012-11-05 10:54:21 -07:00
parent fe74dc7e32 0cffac95de
commit a0cd575c95
6 changed files with 317 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/PerconaTest.pm
View File

@@ -740,8 +740,9 @@ sub full_output {
or die "Cannot open file $file: $OS_ERROR";
*STDOUT->autoflush(1);
open *STDERR, '>', $file
or die "Cannot open file $file: $OS_ERROR";
my (undef, $file2) = tempfile();
open *STDERR, '>', $file2
or die "Cannot open file $file2: $OS_ERROR";
*STDERR->autoflush(1);
my $status;
@@ -766,8 +767,11 @@ sub full_output {
exit $code->();
}
close $_ or die "Cannot close $_: $OS_ERROR" for qw(STDOUT STDERR);
my $output = do { local $/; open my $fh, "<", $file or die $!; <$fh> };
my $output = slurp_file($file) . slurp_file($file2);
unlink $file;
unlink $file2;
return ($output, $status);
}