bk commit into 5.0 tree (msvensson:1.2063) BUG#17574

[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.2063 06/03/07 19:44:58 msvensson@shellback.(none) +3 -0
  Bug#17574 Detect cluster start failure and "fail" ndb_* tests

  mysql-test/mysql-test-run.pl
    1.74 06/03/07 19:44:53 msvensson@shellback.(none) +20 -4
    Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install
if test run should continue or if it should be aborted
    Faile ndb test and print special error message if it's a ndb test and
flag_ndb_status_ok is not ok

  mysql-test/lib/mtr_report.pl
    1.20 06/03/07 19:44:53 msvensson@shellback.(none) +5 -0
    Print special error message for ndb_test that are failed due to failure to start or
install ndbcluster

  mysql-test/lib/mtr_cases.pl
    1.15 06/03/07 19:44:53 msvensson@shellback.(none) +2 -7
    Always set "ndb_test" if tets name contains ndb. 
    Set to skipped if "--skip-ndbcluster"

# 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

--- 1.14/mysql-test/lib/mtr_cases.pl	2006-02-12 04:26:42 +01:00
+++ 1.15/mysql-test/lib/mtr_cases.pl	2006-03-07 19:44:53 +01:00
@@ -253,18 +253,13 @@
   }
 
   # Cluster is needed by test case if testname contains ndb
-  if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and
-       defined mtr_match_substring($tname,"ndb") )
+  if ( defined mtr_match_substring($tname,"ndb") )
   {
+    $tinfo->{'ndb_test'}= 1;
     if ( $::opt_skip_ndbcluster )
     {
-      $tinfo->{'ndb_test'}= 0;
       $tinfo->{'skip'}= 1;
       return;
-    }
-    else
-    {
-      $tinfo->{'ndb_test'}= 1;
     }
   }
   else

--- 1.19/mysql-test/lib/mtr_report.pl	2006-02-12 04:26:43 +01:00
+++ 1.20/mysql-test/lib/mtr_report.pl	2006-03-07 19:44:53 +01:00
@@ -114,6 +114,11 @@
   {
     print "[ fail ]  timeout\n";
   }
+  elsif ( $tinfo->{'ndb_test'} and  !$::flag_ndb_status_ok)
+  {
+    print "[ fail ]  ndbcluster start failure\n";
+    return;
+  }
   else
   {
     print "[ fail ]\n";

--- 1.73/mysql-test/mysql-test-run.pl	2006-03-01 13:29:27 +01:00
+++ 1.74/mysql-test/mysql-test-run.pl	2006-03-07 19:44:53 +01:00
@@ -1396,7 +1396,6 @@
 		 "--initial"],
 		"", "", "", "") )
   {
-    mtr_error("Error ndbcluster_install");
     return 1;
   }
 
@@ -1603,9 +1602,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;
@@ -1802,6 +1811,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;
   }