From 60d5f457c89fb1b6e8967ab6273d88bddb06b7d9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Mar 2006 00:39:06 -0800 Subject: [PATCH] BUG#15961: After review fixes New error message sql/share/errmsg.txt: New error message sql/sql_partition.cc: New error message --- sql/share/errmsg.txt | 4 ++++ sql/sql_partition.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index d163da30e95..36f96029e8a 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5614,6 +5614,10 @@ ER_PARTITION_MAXVALUE_ERROR ER_PARTITION_SUBPARTITION_ERROR eng "Subpartitions can only be hash partitions and by key" swe "Subpartitioner kan bara vara hash och key partitioner" +ER_PARTITION_SUBPART_MIX_ERROR + eng "Must define subpartitions on all partitions if on one partition" + swe "Subpartitioner mÃ¥ste definieras pÃ¥ alla partitioner om pÃ¥ en" + ER_PARTITION_WRONG_NO_PART_ERROR eng "Wrong number of partitions defined, mismatch with previous setting" swe "Antal partitioner definierade och antal partitioner är inte lika" diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index d0d600c2e81..374bc511826 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_SUBPARTITION_ERROR, MYF(0)); + my_error(ER_PARTITION_SUBPART_MIX_ERROR, MYF(0)); goto end; } if (unlikely(part_info->set_up_defaults_for_partitioning(file,