From 16ab4447bf066bfd92d5dde308ab46e4b96916fd Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Mon, 4 Oct 2004 13:53:36 +0000
Subject: [PATCH] corrected merge error rgarding NDB_CONNECTSTRING

---
 mysql-test/mysql-test-run.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 2079398e942..b12f7afb9f1 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -942,13 +942,14 @@ start_ndbcluster()
       NDBCLUSTER_OPTS="--small"
     fi
     ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT $NDBCLUSTER_OPTS --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
-    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""
+    NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
   else
-    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""
-    echo "Using ndbcluster at $USE_NDBCLUSTER"
+    NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
+    echo "Using ndbcluster at $NDB_CONNECTSTRING"
   fi
+  USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$NDB_CONNECTSTRING\""
+  export NDB_CONNECTSTRING
   fi
-
 }
 
 stop_ndbcluster()