From 36aa28571884886a74b7cc29ab2a7d890f60d41f Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Thu, 1 Jun 2006 13:14:09 +0200
Subject: [PATCH] Don't send port for ndb_mgmd to mtr_check_stop_servers. As
 it's not being shutdown by "ndb_mgm shutdown" it's no idea to wait for it to
 stop listening to port. Just make sure it's being killed.

---
 mysql-test/lib/mtr_process.pl | 3 +--
 mysql-test/mysql-test-run.pl  | 9 +++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 4e5e956a924..307cc552b54 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -389,8 +389,7 @@ sub mtr_kill_leftovers () {
 
     push(@kill_pids,{
 		     pid      => $cluster->{'pid'},
-		     pidfile  => $cluster->{'path_pid'},
-		     port     => $cluster->{'port'},
+		     pidfile  => $cluster->{'path_pid'}
 		    });
 
     $cluster->{'pid'}= 0; # Assume we are done with it
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c37e25e49ec..88a00b992ec 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2865,8 +2865,7 @@ sub stop_all_servers () {
 
       push(@kill_pids,{
 		       pid      => $cluster->{'pid'},
-		       pidfile  => $cluster->{'path_pid'},
-		       port     => $cluster->{'port'},
+		       pidfile  => $cluster->{'path_pid'}
 		      });
 
       $cluster->{'pid'}= 0; # Assume we are done with it
@@ -3007,8 +3006,7 @@ sub run_testcase_stop_servers($) {
 
       push(@kill_pids,{
 		       pid      => $cluster->{'pid'},
-		       pidfile  => $cluster->{'path_pid'},
-		       port     => $cluster->{'port'},
+		       pidfile  => $cluster->{'path_pid'}
 		      });
 
       $cluster->{'pid'}= 0; # Assume we are done with it
@@ -3062,8 +3060,7 @@ sub run_testcase_stop_servers($) {
 
     push(@kill_pids,{
 		     pid      => $cluster->{'pid'},
-		     pidfile  => $cluster->{'path_pid'},
-		     port     => $cluster->{'port'},
+		     pidfile  => $cluster->{'path_pid'}
 		    });
 
     $cluster->{'pid'}= 0; # Assume we are done with it