Commit afff82fd authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 

into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster


mysql-test/mysql-test-run.pl:
  Auto merged
parents 64bec50c fb601b13

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ sub kill_running_server () { 
    mkpath("$opt_vardir/log"); # Needed for mysqladmin log

    mtr_kill_leftovers();



    $using_ndbcluster_master= 1;

    $using_ndbcluster_master= $opt_with_ndbcluster;

    ndbcluster_stop();

    $master->[0]->{'ndbcluster'}= 1;

    ndbcluster_stop_slave();