summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.(none)>2004-08-23 15:12:38 +0000
committerunknown <tomas@poseidon.(none)>2004-08-23 15:12:38 +0000
commit8522f83038f1021374a565e70ab842511d4dae97 (patch)
treeac984d5229ccf5b3acaf55ce3b17b3e8628905e8 /mysql-test
parent40f282d593b83453344136144b7071d9b6e4c025 (diff)
downloadmariadb-git-8522f83038f1021374a565e70ab842511d4dae97.tar.gz
reverted default setting of --ndbcluster if --ndb-connectstring is given
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 4c021cd9aa0..58d7af75284 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1451,9 +1451,9 @@ then
then
echo "Starting ndbcluster"
./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
- USE_NDBCLUSTER="--ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""
+ USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""
else
- USE_NDBCLUSTER="--ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""
+ USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""
echo "Using ndbcluster at $USE_NDBCLUSTER"
fi
fi