bk commit into 5.1 tree (msvensson:1.2161)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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.2161 06/03/07 20:03:01 msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
  into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574

  mysql-test/lib/mtr_cases.pl
    1.17 06/03/07 20:02:56 msvensson@shellback.(none) +13 -5
    Manual merge of bug#17574 from 5.0 -> 5.1

  mysql-test/mysql-test-run.pl
    1.81 06/03/07 19:48:50 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/my51-bug17574/RESYNC

--- 1.16/mysql-test/lib/mtr_cases.pl	2006-02-12 04:41:50 +01:00
+++ 1.17/mysql-test/lib/mtr_cases.pl	2006-03-07 20:02:56 +01:00
@@ -252,19 +252,27 @@
     $tinfo->{'slave_restart'}= 1;
   }
 
-  if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and
-       ( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") ))
+  if ( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") )
   {
+    # This is an ndb test or all tests should be run with ndb cluster started
     $tinfo->{'ndb_test'}= 1;
+    if ( $::opt_skip_ndbcluster )
+    {
+      # All ndb test's should be skipped
+      $tinfo->{'skip'}= 1;
+      return;
+    }
   }
   else
   {
+    # This is not a ndb test
+    $tinfo->{'ndb_test'}= 0;
     if ( $::opt_with_ndbcluster_only )
-    {
+    { 
+      # Only the ndb test should be run, all other should be skipped
       $tinfo->{'skip'}= 1;
       return;
     }
-    $tinfo->{'ndb_test'}= 0;
   }
 
   # FIXME what about embedded_server + ndbcluster, skip ?!

--- 1.80/mysql-test/mysql-test-run.pl	2006-03-03 15:13:05 +01:00
+++ 1.81/mysql-test/mysql-test-run.pl	2006-03-07 19:48:50 +01:00
@@ -1468,7 +1468,6 @@
 	         "--core"],
 		"", "", "", "") )
   {
-    mtr_error("Error ndbcluster_install");
     return 1;
   }
 
@@ -1777,9 +1776,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);
+    }
   }
 
   if ( ndbcluster_install_slave() )
@@ -1986,6 +1995,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;
   }