bk commit into 5.0 tree (msvensson:1.2076) 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.2076 06/03/08 16:57:42 msvensson@shellback.(none) +2 -0
  BUG#17574 Detect cluster start failure and "fail" ndb_* tests
   - Fix problems that occur when ndbcluster is not supported

  mysql-test/mysql-test-run.pl
    1.76 06/03/08 16:57:37 msvensson@shellback.(none) +2 -2
    Check "opt_with_ndbcluster" before deciding to stop masters and when dciding if cluster needs to be started.

  mysql-test/lib/mtr_cases.pl
    1.16 06/03/08 16:57:37 msvensson@shellback.(none) +7 -0
    Marked test to be skipped if it is a ndb test but ndb is not supported

# 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/mysqltestrun_ndbclusterstart/my50-mysqltestrun_ndbclusterstart

--- 1.15/mysql-test/lib/mtr_cases.pl	2006-03-07 19:44:53 +01:00
+++ 1.16/mysql-test/lib/mtr_cases.pl	2006-03-08 16:57:37 +01:00
@@ -258,6 +258,13 @@
     $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;
     }

--- 1.75/mysql-test/mysql-test-run.pl	2006-03-07 20:40:58 +01:00
+++ 1.76/mysql-test/mysql-test-run.pl	2006-03-08 16:57:37 +01:00
@@ -1840,7 +1840,7 @@
     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 @@
 
     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