bzr push into mysql-trunk-mtr branch (bjorn.munch:3084 to 3085)

[Bjorn Munch]

 3085 Bjorn Munch	2011-07-01 [merge]
      upmerge 11766640 addendum

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
 3084 Bjorn Munch	2011-06-29 [merge]
      null upmerge

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2011-05-24 10:07:40 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2011-07-01 11:15:49 +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");
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-06-16 13:56:45 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-07-01 11:15: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).