From: Bjorn Munch
Date: July 18 2011 10:26am
Subject: bzr push into mysql-trunk branch (bjorn.munch:3268 to 3270)
List-Archive: http://lists.mysql.com/commits/140341
Message-Id: <201107181026.p6IAQx1J009802@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3270 Bjorn Munch	2011-07-18 [merge]
      null upmerge

 3269 Bjorn Munch	2011-07-18 [merge]
      merge from trunk-mtr

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
 3268 Anitha Gopi	2011-07-18
      default.weekly is made the master suite. Includes all of daily, non debug runs. engine independant suite and tests that need big test option. IMproved formatting and added comments to default.daily

    modified:
      mysql-test/collections/default.daily
      mysql-test/collections/default.weekly
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2011-06-21 10:05:48 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2011-07-04 12:59:01 +0000
@@ -111,6 +111,9 @@ sub collect_test_cases ($$$$) {
   my $opt_skip_test_list= shift;
   my $cases= []; # Array of hash(one hash for each testcase)
 
+  # Unit tests off by default also if using --do-test or --start-from
+  $::opt_ctest= 0 if $::opt_ctest == -1 && ($do_test || $start_from);
+
   $do_test_reg= init_pattern($do_test, "--do-test");
   $skip_test_reg= init_pattern($skip_test, "--skip-test");
 
@@ -644,9 +647,9 @@ sub optimize_cases {
       if (defined $default_temp_engine){
 
 	#print " $tinfo->{name}\n";
-	#print " - The test asked to use '$default_engine'\n";
+	#print " - The test asked to use '$default_temp_engine' as temp engine\n";
 
-	#my $engine_value= $::mysqld_variables{$default_engine};
+	#my $engine_value= $::mysqld_variables{$default_temp_engine};
 	#print " - The mysqld_variables says '$engine_value'\n";
 
 	if ( ! exists $::mysqld_variables{$default_temp_engine} and

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-07-07 09:45:10 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-07-15 15:41:49 +0000
@@ -198,7 +198,7 @@ our $opt_debug_server;
 our @opt_cases;                  # The test cases names in argv
 our $opt_embedded_server;
 # -1 indicates use default, override with env.var.
-my $opt_ctest= env_or_val(MTR_UNIT_TESTS => -1);
+our $opt_ctest= env_or_val(MTR_UNIT_TESTS => -1);
 # Unit test report stored here for delayed printing
 my $ctest_report;
 

No bundle (reason: useless for push emails).