From: Bjorn Munch
Date: July 18 2011 10:27am
Subject: bzr push into mysql-5.5 branch (bjorn.munch:3466 to 3468)
List-Archive: http://lists.mysql.com/commits/140342
Message-Id: <201107181027.p6IARpZc009823@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

 3467 Bjorn Munch	2011-07-18 [merge]
      merge from 5.5-mtr

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
 3466 Tor Didriksen	2011-07-18
      Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE SENSE 
      
      Truncate result of decimal division before converting to integer.
     @ mysql-test/r/func_math.result
        New test case.
     @ mysql-test/t/func_math.test
        New test case.
     @ sql/item_func.cc
        Item_func_int_div::val_int():
        Truncate result of decimal division before converting to integer.

    modified:
      mysql-test/r/func_math.result
      mysql-test/t/func_math.test
      sql/item_func.cc
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2011-05-24 08:54:34 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2011-06-30 14:51:02 +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-07-07 09:42:14 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-07-15 15:12:23 +0000
@@ -197,7 +197,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).