Merge 2.1.

This commit is contained in:
Daniel Nichter
2012-06-03 13:29:02 -04:00
551 changed files with 55822 additions and 9789 deletions

View File

@@ -34,12 +34,8 @@ else {
my $output;
my $cmd;
my $pid_file = "/tmp/pt-query-digest-mirror-test.pid";
diag(`rm $pid_file 2>/dev/null`);
my $pid_file = '/tmp/pt-query-digest.test.pid';
`rm -rf $pid_file >/dev/null`;
# ##########################################################################
# Tests for swapping --processlist and --execute
# ##########################################################################
@@ -74,10 +70,9 @@ is(
'',
'It is stopped now'
);
=======
$output = `ps -p $output`;
$output = `ps -p $pid`;
unlike($output, qr/pt-query-digest/, 'It is stopped now');
>>>>>>> MERGE-SOURCE
$output = `grep read_only /tmp/read_only.txt`;
# Sample output: