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

 - Fix problems that occur when ndbcluster is not supported

mysql-test/lib/mtr_cases.pl

@@ -258,6 +258,13 @@ sub collect_one_test_case($$$$$$$) {
     $tinfo->{'ndb_test'}= 1;
     if ( $::opt_skip_ndbcluster )
     {
+      # Skip all ndb tests
+      $tinfo->{'skip'}= 1;
+      return;
+    }
+    if ( ! $::opt_with_ndbcluster )
+    {
+      # Ndb is not supported, skip them
       $tinfo->{'skip'}= 1;
       return;
     }

mysql-test/mysql-test-run.pl

@@ -1840,7 +1840,7 @@ sub run_testcase ($) {
     if ( $tinfo->{'master_restart'} or
          $master->[0]->{'running_master_is_special'} or
 	 # Stop if cluster is started but test cases does not need cluster
-	 ( $tinfo->{'ndb_test'} != $using_ndbcluster_master ) )
+	 ( $opt_with_ndbcluster && $tinfo->{'ndb_test'} != $using_ndbcluster_master ) )
     {
       stop_masters();
       $master->[0]->{'running_master_is_special'}= 0; # Forget why we stopped
@@ -1889,7 +1889,7 @@ sub run_testcase ($) {
 
     if ( $tinfo->{'component_id'} eq 'mysqld' and ! $opt_local_master )
     {
-      if ( $master->[0]->{'ndbcluster'} )
+      if ( $opt_with_ndbcluster and $master->[0]->{'ndbcluster'} )
       {
 	# Cluster is not started