List:Internals« Previous MessageNext Message »
From:tomas Date:November 24 2005 4:33pm
Subject:bk commit into 5.1 tree (tomas:1.1978)
View as plain text  
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.1978 05/11/24 17:33:00 tomas@stripped +1 -0
  corrected erroneous ndbcluster startup

  mysql-test/mysql-test-run.sh
    1.283 05/11/24 17:32:54 tomas@stripped +7 -5
    corrected erroneous ndbcluster startup

# 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.282/mysql-test/mysql-test-run.sh	2005-11-24 12:27:19 +01:00
+++ 1.283/mysql-test/mysql-test-run.sh	2005-11-24 17:32:54 +01:00
@@ -1213,7 +1213,13 @@
 
 start_ndbcluster()
 {
-  if [ x$USING_NDBCLUSTER = x1 -a -n "$USE_NDBCLUSTER" -a -z "$USE_NDBCLUSTER_OPT" ]
+  if [ ! -n "$USE_NDBCLUSTER" ] ;
+  then
+    USING_NDBCLUSTER=0
+    USE_NDBCLUSTER_OPT=
+  fi
+  
+  if [ x$USING_NDBCLUSTER = x1 -a -z "$USE_NDBCLUSTER_OPT" ]
   then
   rm -f $NDB_TOOLS_OUTPUT
   if [ -z "$USE_RUNNING_NDBCLUSTER" ]
@@ -1241,10 +1247,6 @@
   fi
   USE_NDBCLUSTER_OPT="$USE_NDBCLUSTER --ndb-connectstring=\"$NDB_CONNECTSTRING\""
   export NDB_CONNECTSTRING
-  else
-    USING_NDBCLUSTER=0
-    USE_NDBCLUSTER_OPT=
-    return
   fi
 }
 
Thread
bk commit into 5.1 tree (tomas:1.1978)tomas24 Nov