database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  zim.(none):/home/mikael/bug15961


sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
This commit is contained in:
unknown
2006-03-14 00:51:44 -08:00
parent 6048eb31ae 60d5f457c8
commit 4ee001c5f1
6 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_partition.cc
View File

@@ -692,12 +692,19 @@ bool check_partition_info(partition_info *part_info,handlerton **eng_type,
char *same_name;
DBUG_ENTER("check_partition_info");
if (unlikely(!part_info->is_sub_partitioned() &&
!(part_info->use_default_subpartitions &&
part_info->use_default_no_subpartitions)))
{
my_error(ER_SUBPARTITION_ERROR, MYF(0));
goto end;
}
if (unlikely(part_info->is_sub_partitioned() &&
(!(part_info->part_type == RANGE_PARTITION ||
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,