summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-06-02 10:37:42 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-06-02 10:37:42 +0000
commit9f7c48604435cf6254da7816810575b2a03695b0 (patch)
tree81ae58f3861a002e1f60ae8d1622efbf7a91a950 /mysql-test/mysql-test-run.sh
parentfa0df3e336bb98acaad72f48ab82a706c73b56bc (diff)
downloadmariadb-git-9f7c48604435cf6254da7816810575b2a03695b0.tar.gz
collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes
BitKeeper/deleted/.del-stop_ndbcluster.sh~b3b9e9505384aca1: Delete: mysql-test/ndb/stop_ndbcluster.sh mysql-test/mysql-test-run.sh: collapsed ndb start/stop scripts mysql-test/ndb/Makefile.am: collapsed ndb start/stop scripts mysql-test/ndb/ndbcluster.sh: collapsed ndb start/stop scripts + ndb bin name changes ndb/src/kernel/Makefile.am: ndb bin name changes ndb/src/kernel/blocks/backup/restore/Makefile.am: ndb bin name changes ndb/src/mgmclient/Makefile.am: ndb bin name changes ndb/src/mgmsrv/Makefile.am: ndb bin name changes ndb/tools/Makefile.am: ndb bin name changes
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 8d675ec7f68..13ddb8f221e 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1417,7 +1417,7 @@ then
if [ -z "$USE_RUNNING_NDBCLUSTER" ]
then
# Kill any running ndbcluster stuff
- ./ndb/stop_ndbcluster
+ ./ndb/ndbcluster --stop
fi
fi
@@ -1438,7 +1438,7 @@ then
if [ -z "$USE_RUNNING_NDBCLUSTER" ]
then
echo "Starting ndbcluster"
- ./ndb/install_ndbcluster --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
+ ./ndb/ndbcluster --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
export NDB_CONNECTSTRING=`cat Ndb.cfg`
else
export NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
@@ -1538,7 +1538,7 @@ then
if [ -z "$USE_RUNNING_NDBCLUSTER" ]
then
# Kill any running ndbcluster stuff
- ./ndb/stop_ndbcluster
+ ./ndb/ndbcluster --stop
fi
fi