From 3dd1ef7bb6eec7db070d3b8917b5146aac60f59c Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 4 Sep 2006 11:30:04 +0200
Subject: [PATCH] Fix problem where mysql-test-run.pl fails to start up the
 mysqld after a failed test. Shows up on win hosts where one failed test case
 make subsequent ones fails with error "Could not open connection 'default':
 2003 Can't connect to MySQL server on 'localhost'"

mysql-test/lib/mtr_process.pl:
  Reset the associated "pid" of masters and slave when building the list of processes to shutdown.
---
 mysql-test/lib/mtr_process.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 9a558f91822..bf869ca91c4 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -409,6 +409,7 @@ sub mtr_kill_leftovers () {
 
     mtr_debug("  - Master mysqld " .
               "(idx: $idx; pid: '$pidfile'; socket: '$sockfile'; port: $port)");
+    $::master->[$idx]->{'pid'}= 0; # Assume we are done with it
   }
 
   for ( my $idx= 0; $idx < 3; $idx++ )
@@ -426,6 +427,8 @@ sub mtr_kill_leftovers () {
 
     mtr_debug("  - Slave mysqld " .
               "(idx: $idx; pid: '$pidfile'; socket: '$sockfile'; port: $port)");
+
+    $::slave->[$idx]->{'pid'}= 0; # Assume we are done with it
   }
 
   mtr_mysqladmin_shutdown(\@args, 20);