From: Mattias Jonsson Date: December 17 2010 12:48pm Subject: bzr commit into mysql-trunk branch (mattias.jonsson:3211) WL#5217 List-Archive: http://lists.mysql.com/commits/127193 Message-Id: <201012171248.oBHCmdST006204@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5600933657216157230==" --===============5600933657216157230== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mattiasj/mysql-bzr/topush-trunk-wl5217/ based on revid:mattias.jonsson@stripped 3211 Mattias Jonsson 2010-12-17 WL#5217: Add explicit partition selection pre-push test fixes @ mysql-test/suite/parts/t/partition_debug_myisam.test Disable the test on embedded, since restart does not work. @ mysql-test/t/wl5217.test Set the default storage engine to InnoDB, to pass on embedded. @ sql/partition_info.cc Wrong order of DBUG_ASSERT, and an assert that was not correct. added: mysql-test/collections/mysql-trunk-wl5217.push modified: mysql-test/r/wl5217.result mysql-test/suite/parts/t/partition_debug_myisam.test mysql-test/t/wl5217.test sql/partition_info.cc === added file 'mysql-test/collections/mysql-trunk-wl5217.push' --- a/mysql-test/collections/mysql-trunk-wl5217.push 1970-01-01 00:00:00 +0000 +++ b/mysql-test/collections/mysql-trunk-wl5217.push 2010-12-17 12:48:18 +0000 @@ -0,0 +1,8 @@ +perl mysql-test-run.pl --suite=main,sys_vars,binlog,federated,rpl,innodb,perfschema,parts --force --timer --parallel=auto --comment=normal --skip-ndbcluster --report-features --experimental=collections/default.experimental +perl mysql-test-run.pl --suite=main,sys_vars,binlog,federated,rpl,innodb,perfschema,parts --force --timer --parallel=auto --comment=ps --skip-ndbcluster --ps-protocol --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --parallel=auto --comment=funcs1+ps --suite=funcs_1 --ps-protocol --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --parallel=auto --comment=funcs2 --suite=funcs_2 --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --parallel=auto --comment=stress --suite=stress --experimental=collections/default.experimental +perl mysql-test-run.pl --force --timer --parallel=auto --comment=jp --suite=jp --experimental=collections/default.experimental +perl mysql-test-run.pl --suite=main,sys_vars,binlog,federated,rpl,innodb,perfschema,parts --force --timer --parallel=auto --comment=embedded --embedded-server --skip-rpl --skip-ndbcluster --experimental=collections/default.experimental +perl mysql-test-run.pl --suite=main,sys_vars,binlog,federated,rpl,innodb,perfschema,parts --force --timer --parallel=auto --comment=debug --skip-ndbcluster --skip-rpl --report-features --experimental=collections/default.experimental === modified file 'mysql-test/r/wl5217.result' --- a/mysql-test/r/wl5217.result 2010-12-14 15:13:57 +0000 +++ b/mysql-test/r/wl5217.result 2010-12-17 12:48:18 +0000 @@ -1,3 +1,7 @@ +# Must have InnoDB as engine to get the same statistics results. +# embedded uses MyISAM as default. CREATE SELECT uses the default engine. +SET @old_default_storage_engine = @@default_storage_engine; +SET @@default_storage_engine = 'InnoDB'; # Original tests for WL#5217 # TODO: benchmark what value to use for MAX_PARTITIONS_BEFORE_HASH # Test to show if I_S affects HANDLER_ counts @@ -1095,3 +1099,4 @@ HANDLER_WRITE 17 SELECT * FROM t3 PARTITION (pNeg); ERROR HY000: PARTITION () clause on non partitioned table DROP TABLE t1, t2, t3; +SET @@default_storage_engine = @old_default_storage_engine; === modified file 'mysql-test/suite/parts/t/partition_debug_myisam.test' --- a/mysql-test/suite/parts/t/partition_debug_myisam.test 2010-08-13 07:50:25 +0000 +++ b/mysql-test/suite/parts/t/partition_debug_myisam.test 2010-12-17 12:48:18 +0000 @@ -4,6 +4,8 @@ --source include/have_debug.inc --source include/have_partition.inc --source include/not_valgrind.inc +# Crash tests don't work with embedded +--source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; === modified file 'mysql-test/t/wl5217.test' --- a/mysql-test/t/wl5217.test 2010-12-14 15:13:57 +0000 +++ b/mysql-test/t/wl5217.test 2010-12-17 12:48:18 +0000 @@ -1,24 +1,14 @@ --source include/have_innodb.inc --source include/have_partition.inc +--echo # Must have InnoDB as engine to get the same statistics results. +--echo # embedded uses MyISAM as default. CREATE SELECT uses the default engine. +SET @old_default_storage_engine = @@default_storage_engine; +SET @@default_storage_engine = 'InnoDB'; + --echo # Original tests for WL#5217 --echo # TODO: benchmark what value to use for MAX_PARTITIONS_BEFORE_HASH -#let $get_handler_write_status_counts= SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS -#WHERE (VARIABLE_NAME = 'HANDLER_EXTERNAL_LOCK' OR -#VARIABLE_NAME = 'HANDLER_WRITE') AND -#VARIABLE_VALUE > 0; -#let $get_handler_read_status_counts= SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS -#WHERE (VARIABLE_NAME = 'HANDLER_EXTERNAL_LOCK' OR -#VARIABLE_NAME LIKE 'HANDLER_READ_%') AND -#VARIABLE_VALUE > 0; -#let $get_handler_status_counts= SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS -#WHERE (VARIABLE_NAME = 'HANDLER_EXTERNAL_LOCK' OR -#VARIABLE_NAME = 'HANDLER_UPDATE' OR -#VARIABLE_NAME = 'HANDLER_DELETE' OR -#VARIABLE_NAME = 'HANDLER_WRITE' OR -#VARIABLE_NAME LIKE 'HANDLER_READ_%') AND -#VARIABLE_VALUE > 0; let $get_handler_status_counts= SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0; @@ -504,3 +494,4 @@ eval $get_handler_status_counts; SELECT * FROM t3 PARTITION (pNeg); DROP TABLE t1, t2, t3; +SET @@default_storage_engine = @old_default_storage_engine; === modified file 'sql/partition_info.cc' --- a/sql/partition_info.cc 2010-12-14 20:03:21 +0000 +++ b/sql/partition_info.cc 2010-12-17 12:48:18 +0000 @@ -101,8 +101,8 @@ bool partition_info::prune_partition_bit DBUG_ENTER("partition_info::prune_partition_bitmaps"); DBUG_ASSERT(table && table->s && table->s->ha_part_data); - DBUG_ASSERT(part_name_hash->records); part_name_hash= &table->s->ha_part_data->partition_name_hash; + DBUG_ASSERT(part_name_hash->records); if (num_names < 1) DBUG_RETURN(true); @@ -645,12 +645,13 @@ char *partition_info::has_unique_names() partition_element *el; DBUG_ENTER("partition_info::has_unique_names"); + /* - Only called before the table is created. - If table->s exists one could use the partition_name_hash there instead. + TODO: If table->s->ha_part_data->partition_name_hash.elements is > 0, + then we could just return NULL, but that has not been verified. + And this only happens when in ALTER TABLE with full table copy. */ - DBUG_ASSERT(!table || !table->s); - + max_names= num_parts; if (is_sub_partitioned()) max_names+= num_parts * num_subparts; --===============5600933657216157230== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mattias.jonsson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@stripped\ # h1nuhzt1hnmi9keu # target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-wl5217/ # testament_sha1: c076ffa07da0844cb2833035c019ed48c4f3b855 # timestamp: 2010-12-17 13:48:29 +0100 # source_branch: file:///Users/mattiasj/mysql-bzr/wl5217-trunk/ # base_revision_id: mattias.jonsson@stripped\ # f9arbia2abqng644 # # Begin bundle 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 olrUv/F3JFOFCQqYxSEQ --===============5600933657216157230==--