diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2015-11-18 23:54:01 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-11-26 11:34:16 +0400 |
commit | 753d1f868c0fd52c2ec44a97fe116c01a38d5ffd (patch) | |
tree | 15334b9db1e7dbba85c4486ec93c47f0dee59478 /sql/partition_info.h | |
parent | 0746a0770867b621cb4fee08239419bec69a2de8 (diff) | |
download | mariadb-git-753d1f868c0fd52c2ec44a97fe116c01a38d5ffd.tar.gz |
MDEV-8716 - Obsolete sql_calloc() in favor of THD::calloc() and thd_calloc()
Diffstat (limited to 'sql/partition_info.h')
-rw-r--r-- | sql/partition_info.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index c58fa8bef55..5181e19d568 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -307,7 +307,8 @@ public: return num_parts * (is_sub_partitioned() ? num_subparts : 1); } - bool set_up_defaults_for_partitioning(handler *file, HA_CREATE_INFO *info, + bool set_up_defaults_for_partitioning(THD *thd, handler *file, + HA_CREATE_INFO *info, uint start_no); char *find_duplicate_field(); char *find_duplicate_name(); @@ -371,12 +372,13 @@ public: bool has_same_partitioning(partition_info *new_part_info); private: static int list_part_cmp(const void* a, const void* b); - bool set_up_default_partitions(handler *file, HA_CREATE_INFO *info, + bool set_up_default_partitions(THD *thd, handler *file, HA_CREATE_INFO *info, uint start_no); - bool set_up_default_subpartitions(handler *file, HA_CREATE_INFO *info); - char *create_default_partition_names(uint part_no, uint num_parts, + bool set_up_default_subpartitions(THD *thd, handler *file, + HA_CREATE_INFO *info); + char *create_default_partition_names(THD *thd, uint part_no, uint num_parts, uint start_no); - char *create_default_subpartition_name(uint subpart_no, + char *create_default_subpartition_name(THD *thd, uint subpart_no, const char *part_name); bool prune_partition_bitmaps(TABLE_LIST *table_list); bool add_named_partition(const char *part_name, uint length); |