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

merge

Browse Source
This commit is contained in:
Mattias Jonsson
2009-11-17 22:48:28 +01:00
parent e4f9bd3d14 3ebb8be932
commit 774cdc3c07
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/sql_partition.cc
View File

@ -196,26 +196,27 @@ bool partition_default_handling(TABLE *table, partition_info *part_info,
{
DBUG_ENTER("partition_default_handling");
if (part_info->use_default_no_partitions)
if (!is_create_table_ind)
{
if (!is_create_table_ind &&
table->file->get_no_parts(normalized_path, &part_info->no_parts))
if (part_info->use_default_no_partitions)
{
DBUG_RETURN(TRUE);
if (table->file->get_no_parts(normalized_path, &part_info->no_parts))
{
DBUG_RETURN(TRUE);
}
}
}
else if (part_info->is_sub_partitioned() &&
part_info->use_default_no_subpartitions)
{
uint no_parts;
if (!is_create_table_ind &&
(table->file->get_no_parts(normalized_path, &no_parts)))
else if (part_info->is_sub_partitioned() &&
part_info->use_default_no_subpartitions)
{
DBUG_RETURN(TRUE);
uint no_parts;
if (table->file->get_no_parts(normalized_path, &no_parts))
{
DBUG_RETURN(TRUE);
}
DBUG_ASSERT(part_info->no_parts > 0);
DBUG_ASSERT((no_parts % part_info->no_parts) == 0);
part_info->no_subparts= no_parts / part_info->no_parts;
}
DBUG_ASSERT(part_info->no_parts > 0);
part_info->no_subparts= no_parts / part_info->no_parts;
DBUG_ASSERT((no_parts % part_info->no_parts) == 0);
}
part_info->set_up_defaults_for_partitioning(table->file,
(ulonglong)0, (uint)0);