1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge

Browse Source
This commit is contained in:
unknown 2006-03-14 03:46:12 -08:00
parent d99924098f
commit 86293ca6fd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/partition.result
View File

@ -476,6 +476,7 @@ subpartition by hash(a)
(partition p0 values less than (0), (partition p0 values less than (0),
partition p1 values less than (1) (subpartition sp0)); partition p1 values less than (1) (subpartition sp0));
ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '))' at line 5 ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '))' at line 5
create table t1 (a int)
partition by hash (a) partition by hash (a)
(partition p0 (subpartition sp0)); (partition p0 (subpartition sp0));
ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

6
mysql-test/t/partition.test
View File

@ -504,14 +504,14 @@ from information_schema.partitions where table_schema ='test';
drop table t1; drop table t1;
# NULL for LIST partition # NULL for LIST partition
--error 1473 --error ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
create table t1 (a int,b int, c int) create table t1 (a int,b int, c int)
partition by list(a) partition by list(a)
partitions 2 partitions 2
(partition x123 values in (11,12), (partition x123 values in (11,12),
partition x234 values in (1 ,NULL, NULL)); partition x234 values in (1 ,NULL, NULL));
--error 1473 --error ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
create table t1 (a int,b int, c int) create table t1 (a int,b int, c int)
partition by list(a) partition by list(a)
partitions 2 partitions 2
@ -523,7 +523,7 @@ partition by list(a)
partitions 2 partitions 2
(partition x123 values in (11, 12), (partition x123 values in (11, 12),
partition x234 values in (5, 1)); partition x234 values in (5, 1));
--error 1504 --error ER_NO_PARTITION_FOR_GIVEN_VALUE
insert into t1 values (NULL,1,1); insert into t1 values (NULL,1,1);
drop table t1; drop table t1;

2
sql/sql_partition.cc
View File

@ -704,7 +704,7 @@ bool check_partition_info(partition_info *part_info,handlerton **eng_type,
part_info->part_type == LIST_PARTITION)))) part_info->part_type == LIST_PARTITION))))
{ {
/* Only RANGE and LIST partitioning can be subpartitioned */ /* Only RANGE and LIST partitioning can be subpartitioned */
my_error(ER_PARTITION_SUBPART_MIX_ERROR, MYF(0)); my_error(ER_SUBPARTITION_ERROR, MYF(0));
goto end; goto end;
} }
if (unlikely(part_info->set_up_defaults_for_partitioning(file, if (unlikely(part_info->set_up_defaults_for_partitioning(file,