From 39c9f50ac930cea80b331f0b86b3c9023f8d46fc Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Thu, 20 Jan 2005 20:27:17 +0100
Subject: [PATCH] mysql-test-run.sh:   skip ndbcluster start failure if --force
 given

---
 mysql-test/mysql-test-run.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index e13daa1a5c2..a6cbea2d1e5 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -973,7 +973,13 @@ start_ndbcluster()
     else
       NDBCLUSTER_EXTRA_OPTS="--small"
     fi
-    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || exit 1
+    NDB_STARTED=1
+    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || NDB_STARTED=0
+    if [ x$NDB_STARTED != x1 ] ; then
+      if [ x$FORCE != x1 ] ; then
+        exit 1
+      fi
+    fi
     NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
   else
     NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"