diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-04 00:34:34 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-04 00:34:34 +0000 |
| commit | 15d474b20c0e7fad5afd3644539a0d5248a11d65 (patch) | |
| tree | 8170f6b1866f09bddb1ba0d06a94f9041390bb60 | |
| parent | de3a7d110719dc3da7ab6c707917849f18ce6d32 (diff) | |
| parent | 9752b3154c3ec6b8efab9e256e01b0fa15781147 (diff) | |
| download | mariadb-git-15d474b20c0e7fad5afd3644539a0d5248a11d65.tar.gz | |
Merge
mysql-test/mysql-test-run.sh:
SCCS merged
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 5bac436e4f9..2079398e942 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1604,14 +1604,7 @@ then fi fi - if [ ! -z "$USE_NDBCLUSTER" ] - then - if [ -z "$USE_RUNNING_NDBCLUSTER" ] - then - # Kill any running ndbcluster stuff - ./ndb/ndbcluster --data-dir=$MYSQL_TEST_DIR/var --port-base=$NDBCLUSTER_PORT --stop - fi - fi + stop_ndbcluster # Remove files that can cause problems $RM -rf $MYSQL_TEST_DIR/var/ndbcluster |