Commit c7fced7f authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

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


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents b6717496 e43a7625

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,7 @@ sub kill_running_server () { 
    $using_ndbcluster_master= $opt_with_ndbcluster;

    ndbcluster_stop();

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

    $using_ndbcluster_slave= $opt_with_ndbcluster;

    ndbcluster_stop_slave();

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

  }