diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index f212036e69b..feed5483827 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -476,6 +476,7 @@ subpartition by hash(a) (partition p0 values less than (0), partition p1 values less than (1) (subpartition sp0)); 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 p0 (subpartition sp0)); ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 06ebabe2a23..bac8b6573e6 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -504,14 +504,14 @@ from information_schema.partitions where table_schema ='test'; drop table t1; # NULL for LIST partition ---error 1473 +--error ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR create table t1 (a int,b int, c int) partition by list(a) partitions 2 (partition x123 values in (11,12), 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) partition by list(a) partitions 2 @@ -523,7 +523,7 @@ partition by list(a) partitions 2 (partition x123 values in (11, 12), partition x234 values in (5, 1)); ---error 1504 +--error ER_NO_PARTITION_FOR_GIVEN_VALUE insert into t1 values (NULL,1,1); drop table t1; diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 3fae8ae3b61..18793d43016 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -704,7 +704,7 @@ bool check_partition_info(partition_info *part_info,handlerton **eng_type, part_info->part_type == LIST_PARTITION)))) { /* 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; } if (unlikely(part_info->set_up_defaults_for_partitioning(file,