Merge

mysql-test/mysql-test-run.sh: SCCS merged

Merge
mysql-test/mysql-test-run.sh: SCCS merged
15d474b2 · unknown · de3a7d11 · 9752b315 · 15d474b2
Commit 15d474b2 authored Oct 04, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

mysql-test/mysql-test-run.sh mysql-test/mysql-test-run.sh +1 -8

No files found.
--- 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" ]
+  stop_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
  # Remove files that can cause problems
  $RM -rf $MYSQL_TEST_DIR/var/ndbcluster