Commit 1885ab01 authored by unknown's avatar unknown
Browse files

Don't send port for ndb_mgmd to mtr_check_stop_servers. As it's not being... 

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:
  Don't send port for ndb_mgmd to mtr_check_stop_servers.
mysql-test/mysql-test-run.pl:
  Don't send port for ndb_mgmd to mtr_check_stop_servers.
parent 304199d7

mysql-test/lib/mtr_process.pl

+1 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/mysql-test-run.pl

+3 −6
Original line number Diff line number Diff line
@@ -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