diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/partition_info.cc | 13 | ||||
| -rw-r--r-- | sql/partition_info.h | 46 | ||||
| -rw-r--r-- | sql/sql_partition.cc | 2 |
3 files changed, 51 insertions, 10 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index f4b7260f8b0..e9dbf2b49c3 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -336,7 +336,8 @@ char *partition_info::create_default_partition_names(THD *thd, uint part_no, { do { - sprintf(move_ptr, "p%u", (start_no + i)); + if (make_partition_name(move_ptr, (start_no + i))) + DBUG_RETURN(NULL); move_ptr+= MAX_PART_NAME_SIZE; } while (++i < num_parts_arg); } @@ -401,17 +402,11 @@ bool partition_info::set_up_default_partitions(THD *thd, handler *file, uint i; char *default_name; bool result= TRUE; - bool alter= false; DBUG_ENTER("partition_info::set_up_default_partitions"); if (part_type == VERSIONING_PARTITION) { - if (start_no > 0) - { - start_no--; - alter= true; - } - else if (use_default_num_partitions) + if (start_no == 0 && use_default_num_partitions) num_parts= 2; use_default_num_partitions= false; } @@ -455,7 +450,7 @@ bool partition_info::set_up_default_partitions(THD *thd, handler *file, default_name+=MAX_PART_NAME_SIZE; if (part_type == VERSIONING_PARTITION) { - if (alter || i < num_parts - 1) { + if (start_no > 0 || i < num_parts - 1) { part_elem->type= partition_element::HISTORY; } else { part_elem->type= partition_element::CURRENT; diff --git a/sql/partition_info.h b/sql/partition_info.h index eb8e53a381a..7ae2d168068 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -34,6 +34,9 @@ typedef bool (*check_constants_func)(THD *thd, partition_info *part_info); struct st_ddl_log_memory_entry; +#define MAX_PART_NAME_SIZE 8 + + struct Vers_part_info : public Sql_alloc { Vers_part_info() : @@ -415,6 +418,7 @@ public: } return NULL; } + uint next_part_no(uint new_parts) const; }; uint32 get_next_partition_id_range(struct st_partition_iter* part_iter); @@ -500,4 +504,46 @@ void partition_info::vers_update_el_ids() } } + +inline +bool make_partition_name(char *move_ptr, uint i) +{ + int res= snprintf(move_ptr, MAX_PART_NAME_SIZE + 1, "p%u", i); + return res < 0 || res > MAX_PART_NAME_SIZE; +} + + +inline +uint partition_info::next_part_no(uint new_parts) const +{ + if (part_type != VERSIONING_PARTITION) + return num_parts; + DBUG_ASSERT(new_parts > 0); + /* Choose first non-occupied name suffix */ + uint32 suffix= num_parts - 1; + DBUG_ASSERT(suffix > 0); + char part_name[MAX_PART_NAME_SIZE + 1]; + List_iterator_fast<partition_element> it(table->part_info->partitions); + for (uint cur_part= 0; cur_part < new_parts; ++cur_part, ++suffix) + { + uint32 cur_suffix= suffix; + if (make_partition_name(part_name, suffix)) + return 0; + partition_element *el; + it.rewind(); + while ((el= it++)) + { + if (0 == my_strcasecmp(&my_charset_latin1, el->partition_name, part_name)) + { + if (make_partition_name(part_name, ++suffix)) + return 0; + it.rewind(); + } + } + if (cur_part > 0 && suffix > cur_suffix) + cur_part= 0; + } + return suffix - new_parts; +} + #endif /* PARTITION_INFO_INCLUDED */ diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 66860762f08..c7b1efc89f3 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -5135,7 +5135,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, alt_part_info->part_type= tab_part_info->part_type; alt_part_info->subpart_type= tab_part_info->subpart_type; if (alt_part_info->set_up_defaults_for_partitioning(thd, table->file, 0, - tab_part_info->num_parts)) + tab_part_info->next_part_no(num_new_partitions))) { goto err; } |