From df0f7938154bbb2a972d8ca1dee461399922447b Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Tue, 6 Mar 2012 13:23:20 -0700
Subject: [PATCH] Fix pt-query-digest mirror.t from previous merges.

---
 t/pt-query-digest/mirror.t | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/t/pt-query-digest/mirror.t b/t/pt-query-digest/mirror.t
index d208747d..23d851c5 100644
--- a/t/pt-query-digest/mirror.t
+++ b/t/pt-query-digest/mirror.t
@@ -28,18 +28,14 @@ elsif ( !$dbh2 ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 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: