Bug#17574 Detect cluster start failure and "fail" ndb_* tests

mysql-test/lib/mtr_cases.pl:
  Always set "ndb_test" if tets name contains ndb. 
  Set to skipped if "--skip-ndbcluster"
mysql-test/lib/mtr_report.pl:
  Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
mysql-test/mysql-test-run.pl:
  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

2 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 568b44d2e59..fc32c56536f 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -253,19 +253,14 @@ sub collect_one_test_case($$$$$$$) {
   }
 
   # 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
   {
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";