From: Mikael Ronstrom Date: August 5 2009 1:01pm Subject: bzr commit into mysql-pe branch (mikael:3513) List-Archive: http://lists.mysql.com/commits/80158 Message-Id: <200908051301.n75D1BLf010085@dator6.liljeholmen.mysql.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/mikael/mysql_clones/mysql-6.0-bugteam-consolidated_push/ 3513 Mikael Ronstrom 2009-08-05 [merge] Automerge modified: mysql-test/r/partition.result mysql-test/t/partition.test sql/sql_partition.cc === modified file 'mysql-test/r/partition.result' --- a/mysql-test/r/partition.result 2009-08-01 00:07:31 +0000 +++ b/mysql-test/r/partition.result 2009-08-05 13:00:56 +0000 @@ -1,4 +1,11 @@ drop table if exists t1, t2; +create table t1 (a int NOT NULL, b varchar(5) NOT NULL) +default charset=utf8 +partition by list (a) +subpartition by key (b) +(partition p0 values in (1), +partition p1 values in (2)); +drop table t1; CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a)) ENGINE=MyISAM PARTITION BY HASH (a); === modified file 'mysql-test/t/partition.test' --- a/mysql-test/t/partition.test 2009-08-01 00:07:31 +0000 +++ b/mysql-test/t/partition.test 2009-08-05 13:00:56 +0000 @@ -15,6 +15,16 @@ drop table if exists t1, t2; --enable_warnings # +# Bug#45904: Error when CHARSET=utf8 and subpartitioning +# +create table t1 (a int NOT NULL, b varchar(5) NOT NULL) +default charset=utf8 +partition by list (a) +subpartition by key (b) +(partition p0 values in (1), + partition p1 values in (2)); +drop table t1; +# # Bug#36001: Partitions: spelling and using some error messages # --error ER_FOREIGN_KEY_ON_PARTITIONED === modified file 'sql/sql_partition.cc' --- a/sql/sql_partition.cc 2009-07-31 19:35:56 +0000 +++ b/sql/sql_partition.cc 2009-08-05 13:00:56 +0000 @@ -1685,7 +1685,7 @@ bool fix_partition_func(THD *thd, TABLE if (((part_info->part_type != HASH_PARTITION || part_info->list_of_part_fields == FALSE) && check_part_func_fields(part_info->part_field_array, TRUE)) || - (part_info->list_of_part_fields == FALSE && + (part_info->list_of_subpart_fields == FALSE && part_info->is_sub_partitioned() && check_part_func_fields(part_info->subpart_field_array, TRUE))) {