1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Manual merge

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

View File

@ -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,