mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Mattias Jonsson 2009-11-17 22:51:49 +01:00
commit 3faaf33333
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/r/partition.result
View file

@ -56,6 +56,13 @@ t1 CREATE TABLE `t1` (
PARTITION p3 VALUES LESS THAN (733969) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (733969) ENGINE = MyISAM,
PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */ PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
DROP TABLE t1; DROP TABLE t1;
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, b int, key(a)) create table t1 (a int, b int, key(a))
partition by list (a) partition by list (a)
( partition p0 values in (1), ( partition p0 values in (1),

11
mysql-test/t/partition.test
View file

@ -70,6 +70,17 @@ SELECT * FROM t1;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
#
# 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#44059: rec_per_key on empty partition gives weird optimiser results # Bug#44059: rec_per_key on empty partition gives weird optimiser results
# #

2
sql/sql_partition.cc
View file

@ -1692,7 +1692,7 @@ bool fix_partition_func(THD *thd, TABLE *table,
if (((part_info->part_type != HASH_PARTITION || if (((part_info->part_type != HASH_PARTITION ||
part_info->list_of_part_fields == FALSE) && part_info->list_of_part_fields == FALSE) &&
check_part_func_fields(part_info->part_field_array, TRUE)) || 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() && part_info->is_sub_partitioned() &&
check_part_func_fields(part_info->subpart_field_array, TRUE))) check_part_func_fields(part_info->subpart_field_array, TRUE)))
{ {