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
This commit is contained in:
unknown 2006-02-16 10:09:53 +01:00
commit c7fced7f0b

View file

@ -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;
}