diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-09 10:35:47 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-09 10:35:47 +0100 |
| commit | 36b485a367b8c09dc437d8e521453990ed468fb3 (patch) | |
| tree | 436a3a4d390ef4582a6f88b0e8aad4acd749147d /mysql-test/mysql-test-run.pl | |
| parent | 472362a8d3286a4727d7c9ea4e951222d0f18c0a (diff) | |
| parent | fb601b1304d6a56482c9ae3c6d840e0f9962cfa9 (diff) | |
| download | mariadb-git-36b485a367b8c09dc437d8e521453990ed468fb3.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cc0762daaac..ae277c4a554 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1185,7 +1185,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; } |