List:Commits« Previous MessageNext Message »
From:Hemant Kumar Date:March 26 2012 11:53am
Subject:bzr push into mysql-trunk branch (hemant.hk.kumar:3856 to 3857)
View as plain text  
 3857 Hemant Kumar	2012-03-26
      Skip certain tests from daily valgrind execution, in order to reduce the overall test execution time on daily valgrind run.

    modified:
      mysql-test/suite/engines/funcs/t/se_string_having.test
      mysql-test/suite/engines/funcs/t/ta_add_column.test
      mysql-test/suite/engines/funcs/t/ta_add_column_first.test
      mysql-test/suite/engines/funcs/t/ta_add_column_middle.test
      mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test
      mysql-test/suite/funcs_2/t/innodb_charset.test
      mysql-test/suite/innodb/t/innodb_bug11766634.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/parts/t/partition_alter1_1_innodb.test
      mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
      mysql-test/suite/parts/t/partition_basic_innodb.test
      mysql-test/suite/parts/t/partition_decimal_myisam.test
      mysql-test/suite/parts/t/partition_int_myisam.test
 3856 Jorgen Loland	2012-03-26
      Bug#13848789: SEGFAULT IN JOIN_READ_NEXT_SAME AT 
                    SQL/SQL_EXECUTOR.CC ON HAVING...IN...JOIN
      
      Consider a query of the form
      
      SELECT ... HAVING (SELECT ...)
      
      in which there is a row in the outer query that satisfies
      all conditions except those in the HAVING clause. In this 
      case, JOIN::exec() used to evaluate the HAVING clause and
      then call return_zero_rows(). return_zero_rows() would, in
      turn, call join->join_free(). Since the subquery in the HAVING
      clause had already been evaluated, join_free() would assume 
      that it would not be evaluated over again and would clean it 
      up. However, return_zero_rows() also evaluated the HAVING 
      clause, and this causes a crash. 
      
      The fix is to not call return_zero_rows() if the reason for
      no matching rows is that the HAVING clause evaluates to false.
     @ mysql-test/include/subquery_sj.inc
        Add test for BUG#13848789
     @ sql/sql_executor.cc
        Don't call return_zero_rows() if the reason for an empty result
        is that HAVING evaluates to false.

    modified:
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      sql/sql_executor.cc
=== modified file 'mysql-test/suite/engines/funcs/t/se_string_having.test'
--- a/mysql-test/suite/engines/funcs/t/se_string_having.test	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/se_string_having.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/engines/funcs/t/ta_add_column.test'
--- a/mysql-test/suite/engines/funcs/t/ta_add_column.test	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/ta_add_column.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/engines/funcs/t/ta_add_column_first.test'
--- a/mysql-test/suite/engines/funcs/t/ta_add_column_first.test	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/ta_add_column_first.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/engines/funcs/t/ta_add_column_middle.test'
--- a/mysql-test/suite/engines/funcs/t/ta_add_column_middle.test	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/ta_add_column_middle.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test'
--- a/mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,6 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS m3;
 --enable_warnings

=== modified file 'mysql-test/suite/funcs_2/t/innodb_charset.test'
--- a/mysql-test/suite/funcs_2/t/innodb_charset.test	2008-07-09 18:55:23 +0000
+++ b/mysql-test/suite/funcs_2/t/innodb_charset.test	2012-03-26 11:51:27 +0000
@@ -5,6 +5,8 @@
 #                                                                              #
 # Checking of other prerequisites is in charset_master.test                    #
 ################################################################################
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
 
 --source include/have_innodb.inc
 

=== modified file 'mysql-test/suite/innodb/t/innodb_bug11766634.test'
--- a/mysql-test/suite/innodb/t/innodb_bug11766634.test	2012-03-16 06:36:29 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug11766634.test	2012-03-26 11:51:27 +0000
@@ -7,6 +7,9 @@
 # records.  The size of ibdata1 must not increase.
 #
 
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
+
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 

=== modified file 'mysql-test/suite/innodb/t/innodb_mysql.test'
--- a/mysql-test/suite/innodb/t/innodb_mysql.test	2011-12-09 21:08:37 +0000
+++ b/mysql-test/suite/innodb/t/innodb_mysql.test	2012-03-26 11:51:27 +0000
@@ -5,6 +5,9 @@
 #               main testing code t/innodb_mysql.test -> include/mix1.inc
 #
 
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
+
 -- source include/have_innodb.inc
 let $engine_type= InnoDB;
 let $other_engine_type= MEMORY;

=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_innodb.test	2010-06-17 17:17:17 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_1_innodb.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
 ################################################################################
 # t/partition_alter1_1_innodb.test                                             #
 #                                                                              #

=== modified file 'mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test	2010-06-17 17:17:17 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
 ################################################################################
 # t/partition_alter2_2_1_innodb.test                                           #
 #                                                                              #

=== modified file 'mysql-test/suite/parts/t/partition_basic_innodb.test'
--- a/mysql-test/suite/parts/t/partition_basic_innodb.test	2010-06-17 17:17:17 +0000
+++ b/mysql-test/suite/parts/t/partition_basic_innodb.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution
+--source include/no_valgrind_without_big.inc
 ################################################################################
 # t/partition_basic_innodb.test                                                #
 #                                                                              #

=== modified file 'mysql-test/suite/parts/t/partition_decimal_myisam.test'
--- a/mysql-test/suite/parts/t/partition_decimal_myisam.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_decimal_myisam.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
 ################################################################################
 # t/partition_decimal_myisam.test                                              #
 #                                                                              #

=== modified file 'mysql-test/suite/parts/t/partition_int_myisam.test'
--- a/mysql-test/suite/parts/t/partition_int_myisam.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_int_myisam.test	2012-03-26 11:51:27 +0000
@@ -1,3 +1,5 @@
+#Want to skip this test from daily Valgrind execution.
+--source include/no_valgrind_without_big.inc
 ################################################################################
 # t/partition_int_myisam.test                                                  #
 #                                                                              #

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (hemant.hk.kumar:3856 to 3857) Hemant Kumar26 Mar