bk commit into 5.0 tree (msvensson:1.2074)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2074 06/03/07 20:41:04 msvensson@shellback.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574

  mysql-test/mysql-test-run.pl
    1.75 06/03/07 20:40:58 msvensson@shellback.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug17574/my50-bug17574/RESYNC

--- 1.74/mysql-test/mysql-test-run.pl	2006-03-03 14:54:59 +01:00
+++ 1.75/mysql-test/mysql-test-run.pl	2006-03-07 20:40:58 +01:00
@@ -1399,7 +1399,6 @@
 		 "--initial"],
 		"", "", "", "") )
   {
-    mtr_error("Error ndbcluster_install");
     return 1;
   }
 
@@ -1606,9 +1605,19 @@
 
   if ( ndbcluster_install() )
   {
-    # failed to install, disable usage but flag that its no ok
-    $opt_with_ndbcluster= 0;
-    $flag_ndb_status_ok= 0;
+    if ( $opt_force)
+    {
+      # failed to install, disable usage and flag that its no ok
+      mtr_report("ndbcluster_install failed, continuing without cluster");
+      $opt_with_ndbcluster= 0;
+      $flag_ndb_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;
@@ -1805,6 +1814,13 @@
   {
     mtr_report_test_name($tinfo);
     mtr_report_test_skipped($tinfo);
+    return;
+  }
+
+  if ( $tinfo->{'ndb_test'}  and ! $flag_ndb_status_ok )
+  {
+    mtr_report_test_name($tinfo);
+    mtr_report_test_failed($tinfo);
     return;
   }