bk commit into 5.1 tree (tomas:1.1976)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1976 05/11/24 12:27:34 tomas@stripped +1 -0
  fixed bug in previous patch to mysql-test-run to only run ndb on the ndb tests

  mysql-test/mysql-test-run.sh
    1.282 05/11/24 12:27:19 tomas@stripped +11 -2
    fixed bug in previous patch to mysql-test-run to only run ndb on the ndb tests

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-repl

--- 1.281/mysql-test/mysql-test-run.sh	2005-11-24 09:59:01 +01:00
+++ 1.282/mysql-test/mysql-test-run.sh	2005-11-24 12:27:19 +01:00
@@ -1213,7 +1213,7 @@
 
 start_ndbcluster()
 {
-  if [ x$USING_NDBCLUSTER = x1 -a -z "$USE_NDBCLUSTER_OPT" ]
+  if [ x$USING_NDBCLUSTER = x1 -a -n "$USE_NDBCLUSTER" -a -z "$USE_NDBCLUSTER_OPT" ]
   then
   rm -f $NDB_TOOLS_OUTPUT
   if [ -z "$USE_RUNNING_NDBCLUSTER" ]
@@ -1241,6 +1241,10 @@
   fi
   USE_NDBCLUSTER_OPT="$USE_NDBCLUSTER --ndb-connectstring=\"$NDB_CONNECTSTRING\""
   export NDB_CONNECTSTRING
+  else
+    USING_NDBCLUSTER=0
+    USE_NDBCLUSTER_OPT=
+    return
   fi
 }
 
@@ -1773,6 +1777,7 @@
      stop_master
      stop_master 1
 
+     # only stop the cluster if this test will not use cluster
      if [ x$NDBCLUSTER_TEST != x1 ] ;
      then
        stop_ndbcluster
@@ -1780,6 +1785,7 @@
 
      report_current_test $tname
      USING_NDBCLUSTER=$NDBCLUSTER_TEST
+     # start_ndbcluster knows if cluster is already started
      start_ndbcluster
      start_master
      if [ x$USING_NDBCLUSTER = x1 -a -z "$DO_BENCH" -a -z "$DO_STRESS" ] ; then
@@ -1791,12 +1797,14 @@
      # or there is no master running (FIXME strange.....)
      # or there is a master init script
      if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] || \
-	[ -f $master_init_script ] || [ x$NDBCLUSTER_TEST != x$USING_NDBCLUSTER ]
+	[ -f $master_init_script ] || \
+        [ -n "$USE_NDBCLUSTER" -a x$NDBCLUSTER_TEST != x$USING_NDBCLUSTER ]
      then
        EXTRA_MASTER_OPT=""
        stop_master
        stop_master 1
 
+       # only stop the cluster if this test will not use cluster
        if [ x$NDBCLUSTER_TEST != x1 ] ;
        then
          stop_ndbcluster
@@ -1804,6 +1812,7 @@
 
        report_current_test $tname
        USING_NDBCLUSTER=$NDBCLUSTER_TEST
+       # start_ndbcluster knows if cluster is already started
        start_ndbcluster
        start_master
        if [ x$USING_NDBCLUSTER = x1  -a -z "$DO_BENCH" -a -z "$DO_STRESS" ] ; then