summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2005-02-16 20:46:34 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2005-02-16 20:46:34 +0100
commit2eb2383ed022ec8ec591f4dde9565b7415f11351 (patch)
tree0387a105d1ce4ed3221548c5d548aa627011c7de /mysql-test/mysql-test-run.pl
parentc3dec835b536c59175de3c5c14a0601c711a982e (diff)
downloadmariadb-git-2eb2383ed022ec8ec591f4dde9565b7415f11351.tar.gz
reuse nodeid if ndbd is restarted
mysql-test/mysql-test-run.pl: start and exit fix for ndbcluster
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f204fee50ed..ec163529ffb 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -358,6 +358,10 @@ sub main () {
if ( $opt_start_and_exit )
{
+ if ( ndbcluster_start() )
+ {
+ mtr_error("Can't start ndbcluster");
+ }
if ( mysqld_start('master',0,[],[]) )
{
mtr_report("Servers started, exiting");
@@ -1054,7 +1058,7 @@ sub ndbcluster_start () {
"--data-dir=$glob_mysql_test_dir/var"],
"", "/dev/null", "", "") )
{
- mtr_error("Error ndbcluster_install");
+ mtr_error("Error ndbcluster_start");
return 1;
}