From f0f8f114f54cc542b51bfd8ac6368e835117ea54 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Tue, 7 Mar 2006 20:35:59 +0100
Subject: [PATCH] Bug#17574 Detect cluster start failure and "fail" ndb_* tests
  - Update for 5.1

mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install_slave
  Check if ndbcluster_install_slave failed after it's been called. continu with disabled slave cluster if  --force is used.
---
 mysql-test/mysql-test-run.pl | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4138e14afba..50047a8903b 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1563,7 +1563,6 @@ sub ndbcluster_install_slave () {
 		 "--core"],
 		"", "", "", "") )
   {
-    mtr_error("Error ndbcluster_install_slave");
     return 1;
   }
 
@@ -1793,9 +1792,20 @@ sub mysql_install_db () {
 
   if ( ndbcluster_install_slave() )
   {
-    # failed to install, disable usage but flag that its no ok
-    $opt_with_ndbcluster_slave= 0;
-    $flag_ndb_slave_status_ok= 0;
+    if ( $opt_force)
+    {
+      # failed to install, disable usage and flag that its no ok
+      mtr_report("ndbcluster_install_slave failed, " .
+		 "continuing without slave cluster");
+      $opt_with_ndbcluster_slave= 0;
+      $flag_ndb_slave_status_ok= 0;
+    }
+    else
+    {
+      print "Aborting: Failed to install ndb cluster\n";
+      print "To continue, re-run with '--force'.\n";
+      mtr_exit(1);
+    }
   }
 
   return 0;