Merge bk-internal:/home/bk/mysql-5.1-new

into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged

2 files changed, 17 insertions, 4 deletions

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index d6068c9691a..3978700c3e8 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -252,19 +252,27 @@ sub collect_one_test_case($$$$$$$) {
     $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 ?!
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 88ddbf63d0f..92ce7437365 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -114,6 +114,11 @@ sub mtr_report_test_failed ($) {
   {
     print "[ fail ]  timeout\n";
   }
+  elsif ( $tinfo->{'ndb_test'} and  !$::flag_ndb_status_ok)
+  {
+    print "[ fail ]  ndbcluster start failure\n";
+    return;
+  }
   else
   {
     print "[ fail ]\n";