From: magnus.blaudd
Date: June 8 2011 2:12pm
Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3316 to 3318)
List-Archive: http://lists.mysql.com/commits/138859
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3318 magnus.blaudd@stripped	2011-06-08
      mtr.pl lockdown
        - Temporaily reduce the footprint of mtr.pl allowing it to run with a larger
          number of failing test

    modified:
      mysql-test/mysql-test-run.pl
 3317 magnus.blaudd@stripped	2011-06-08
      ndb
       - use same set of suites for MySQL Cluster build as in 5.5-cluster

    modified:
      mysql-test/mysql-test-run.pl
 3316 magnus.blaudd@stripped	2011-06-08
      Cherry pick follow up fix for WL#5185

    modified:
      client/mysqltest.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-05-20 11:50:50 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-06-08 14:12:00 +0000
@@ -323,6 +323,13 @@ my $opt_max_test_fail= env_or_val(MTR_MA
 
 my $opt_parallel= $ENV{MTR_PARALLEL} || 1;
 
+## MCP temp fixes to reduce footprint of large number of failing tests
+$opt_max_save_core = 1; # Don't save many cores
+$opt_max_save_datadir = 1; # Dont save many datadirs
+$opt_max_test_fail = 0; # Allow many tests to fail
+$opt_retry = 1; # Don't retry failed tests
+## MCP temp fixes end
+
 select(STDOUT);
 $| = 1; # Automatically flush STDOUT
 
@@ -2734,7 +2741,7 @@ sub check_ndbcluster_support ($) {
     mtr_report(" - MySQL Cluster");
     # Enable ndb engine and add more test suites
     $opt_include_ndbcluster = 1;
-    $DEFAULT_SUITES.=",ndb";
+    $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl";
   }
 
   if ($opt_include_ndbcluster)

No bundle (reason: useless for push emails).