From: Tor Didriksen Date: August 26 2011 11:17am Subject: bzr push into mysql-trunk branch (tor.didriksen:3404 to 3405) Bug#11755836 List-Archive: http://lists.mysql.com/commits/140807 X-Bug: 11755836 Message-Id: <201108261117.p7QBHCqL008278@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3405 Tor Didriksen 2011-08-26 BUG#11755836, tests have now been re-enabled, so make them run without deterministic failure .... modified: mysql-test/suite/rpl/r/rpl_spec_variables.result mysql-test/suite/rpl/t/rpl_spec_variables.test 3404 Tor Didriksen 2011-08-25 Bug#12694872 - VALGRIND: 18,816 BYTES IN 196 BLOCKS ARE DEFINITELY LOST IN UNIQUE::GET The leak was caused by failure to clean up after QUICK_INDEX_MERGE_SELECT/Unique. @ dbug/dbug.c Add line number to RETURN points in DBUG trace. @ mysql-test/include/range.inc New test case. @ mysql-test/r/range_icp.result New test case. @ mysql-test/r/range_icp_mrr.result New test case. @ mysql-test/r/range_mrr.result New test case. @ mysql-test/r/range_mrr_cost.result New test case. @ mysql-test/r/range_none.result New test case. @ sql/filesort.cc DBUG_ASSERT that we are not about to leak record_pointers. Add trace of filesort_free_buffers. @ sql/opt_range.cc Fix DBUG trace. @ sql/sql_select.cc Call free() routines for *all* non-const tables, rather than only the first one. @ sql/uniques.cc Some DBUG_ASSERTS that we are not going to leak memory. modified: dbug/dbug.c mysql-test/include/range.inc mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result sql/filesort.cc sql/opt_range.cc sql/sql_select.cc sql/uniques.cc === modified file 'mysql-test/suite/rpl/r/rpl_spec_variables.result' --- a/mysql-test/suite/rpl/r/rpl_spec_variables.result 2010-12-19 17:15:12 +0000 +++ b/mysql-test/suite/rpl/r/rpl_spec_variables.result 2011-08-26 11:16:40 +0000 @@ -141,11 +141,11 @@ DROP TABLE IF EXISTS t1,t2; * storage_engine * SET @restore_master_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; SET @restore_slave_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=Memory; -SET @@session.storage_engine=Memory; +SET @@global.default_storage_engine=Memory; +SET @@session.default_storage_engine=Memory; CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)); CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; CREATE TABLE t3 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)); @@ -184,8 +184,8 @@ t3 CREATE TABLE `t3` ( `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`a`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; DROP TABLE IF EXISTS t1,t2,t3; * sql_mode * @@ -212,11 +212,11 @@ DROP TABLE t1; *** clean up *** SET @@global.character_set_database=@restore_master_character_set_database; SET @@global.collation_server=@restore_master_collation_server; -SET @@global.storage_engine=@restore_master_storage_engine; +SET @@global.default_storage_engine=@restore_master_storage_engine; SET @@global.character_set_database=@restore_slave_character_set_database; SET @@global.collation_server=@restore_slave_collation_server; SET @@global.max_heap_table_size=@restore_slave_max_heap_table_size; -SET @@global.storage_engine=@restore_slave_storage_engine; +SET @@global.default_storage_engine=@restore_slave_storage_engine; call mtr.add_suppression("The table 't[12]' is full"); include/rpl_end.inc === modified file 'mysql-test/suite/rpl/t/rpl_spec_variables.test' --- a/mysql-test/suite/rpl/t/rpl_spec_variables.test 2010-12-19 17:15:12 +0000 +++ b/mysql-test/suite/rpl/t/rpl_spec_variables.test 2011-08-26 11:16:40 +0000 @@ -221,13 +221,13 @@ DROP TABLE IF EXISTS t1,t2; --connection master SET @restore_master_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; --connection slave SET @restore_slave_storage_engine=@@global.storage_engine; -SET @@global.storage_engine=Memory; -SET @@session.storage_engine=Memory; +SET @@global.default_storage_engine=Memory; +SET @@session.default_storage_engine=Memory; --connection master CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10)); @@ -245,8 +245,8 @@ SHOW CREATE TABLE t1; SHOW CREATE TABLE t2; SHOW CREATE TABLE t3; -SET @@global.storage_engine=InnoDB; -SET @@session.storage_engine=InnoDB; +SET @@global.default_storage_engine=InnoDB; +SET @@session.default_storage_engine=InnoDB; --connection master --disable_warnings @@ -291,12 +291,12 @@ DROP TABLE t1; --connection master SET @@global.character_set_database=@restore_master_character_set_database; SET @@global.collation_server=@restore_master_collation_server; -SET @@global.storage_engine=@restore_master_storage_engine; +SET @@global.default_storage_engine=@restore_master_storage_engine; --sync_slave_with_master SET @@global.character_set_database=@restore_slave_character_set_database; SET @@global.collation_server=@restore_slave_collation_server; SET @@global.max_heap_table_size=@restore_slave_max_heap_table_size; -SET @@global.storage_engine=@restore_slave_storage_engine; +SET @@global.default_storage_engine=@restore_slave_storage_engine; # Put at the end since the test otherwise emptied the table. No bundle (reason: useless for push emails).