bk commit into 5.1 tree (msvensson:1.2322)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-09-25 20:28:40+02:00, msvensson@neptunus.(none) +1 -0
  Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped

  mysql-test/lib/mtr_cases.pl@stripped, 2006-09-25 20:28:36+02:00, msvensson@neptunus.(none) +12 -0
    Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.35/mysql-test/lib/mtr_cases.pl	2006-09-25 20:28:47 +02:00
+++ 1.36/mysql-test/lib/mtr_cases.pl	2006-09-25 20:28:47 +02:00
@@ -390,6 +390,7 @@
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "No tests with sh scripts on Windows";
+      return;
     }
     else
     {
@@ -404,6 +405,7 @@
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "No tests with sh scripts on Windows";
+      return;
     }
     else
     {
@@ -448,6 +450,7 @@
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'disable'}= 1;   # Sub type of 'skip'
+      return;
     }
   }
 
@@ -457,16 +460,19 @@
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "No IM with embedded server";
+      return;
     }
     elsif ( $::opt_ps_protocol )
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "No IM with --ps-protocol";
+      return;
     }
     elsif ( $::opt_skip_im )
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "No IM tests(--skip-im)";
+      return;
     }
   }
   else
@@ -477,18 +483,21 @@
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Test need 'big-test' option";
+      return;
     }
 
     if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test )
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Test need 'ndb_extra' option";
+      return;
     }
 
     if ( $tinfo->{'require_manager'} )
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Test need the _old_ manager(to be removed)";
+      return;
     }
 
     if ( defined $tinfo->{'binlog_format'} and
@@ -496,12 +505,14 @@
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Not running with binlog format '$tinfo->{'binlog_format'}'";
+      return;
     }
 
     if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
     {
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Test need debug binaries";
+      return;
     }
   }
 
@@ -512,6 +523,7 @@
   {
     $tinfo->{'skip'}= 1;
     $tinfo->{'comment'}= "Can't restart a running server";
+    return;
   }
 
 }