summaryrefslogtreecommitdiff
path: root/sql/sql_partition.cc
diff options
context:
space:
mode:
authorunknown <mikael@zim.(none)>2006-03-14 00:39:06 -0800
committerunknown <mikael@zim.(none)>2006-03-14 00:39:06 -0800
commit60d5f457c89fb1b6e8967ab6273d88bddb06b7d9 (patch)
treebd3329d702e4945735183e82a230b95beba9c5e5 /sql/sql_partition.cc
parent29cd6ff642e9072972f9f4fc73ba550170355b8f (diff)
downloadmariadb-git-60d5f457c89fb1b6e8967ab6273d88bddb06b7d9.tar.gz
BUG#15961: After review fixes
New error message sql/share/errmsg.txt: New error message sql/sql_partition.cc: New error message
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r--sql/sql_partition.cc2
1 files changed, 1 insertions, 1 deletions
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,