diff options
author | unknown <magnus@neptunus.(none)> | 2004-07-27 11:57:04 +0200 |
---|---|---|
committer | unknown <magnus@neptunus.(none)> | 2004-07-27 11:57:04 +0200 |
commit | 41f3a2dcf298d0c02ec1bef6272baa7dc4c0766c (patch) | |
tree | 5e8276871d722590389db2de51e2706361cba7ce /mysql-test/mysql-test-run.sh | |
parent | 2bd64bde341af267f4e088ac1d31eb583dbb8c71 (diff) | |
parent | 80e15e2dd4676b910fedfed2f4e60ea541a142c1 (diff) | |
download | mariadb-git-41f3a2dcf298d0c02ec1bef6272baa7dc4c0766c.tar.gz |
Merge
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
SCCS merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 2fb168607b6..853b6302f86 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1449,7 +1449,7 @@ then if [ -z "$USE_RUNNING_NDBCLUSTER" ] then echo "Starting ndbcluster" - ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --discless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1 + ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1 export NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT" else export NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER" |