diff options
| author | Monty <monty@mariadb.org> | 2015-08-24 14:42:07 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-27 22:21:08 +0300 |
| commit | 3cb578c001b2feabd2410f281d20eb6566371453 (patch) | |
| tree | 4e3781e38f6531ea91ff127c024869c6b88c5849 /sql/partition_info.h | |
| parent | ba340d8c47657774ba6d69bfc918dbebaaef6086 (diff) | |
| download | mariadb-git-3cb578c001b2feabd2410f281d20eb6566371453.tar.gz | |
MDEV-6152: Remove calls to current_thd while creating Item
- Part 3: Adding mem_root to push_back() and push_front()
Other things:
- Added THD as an argument to some partition functions.
- Added memory overflow checking for XML tag's in read_xml()
Diffstat (limited to 'sql/partition_info.h')
| -rw-r--r-- | sql/partition_info.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index 8ad7b1fd1fd..8d423f6997a 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -292,7 +292,7 @@ public: } ~partition_info() {} - partition_info *get_clone(); + partition_info *get_clone(THD *thd); bool set_named_partition_bitmap(const char *part_name, uint length); bool set_partition_bitmaps(TABLE_LIST *table_list); /* Answers the question if subpartitioning is used for a certain table */ @@ -328,16 +328,16 @@ public: part_elem_value *val, uint part_id); bool fix_parser_data(THD *thd); - int add_max_value(); + int add_max_value(THD *thd); void init_col_val(part_column_list_val *col_val, Item *item); - int reorganize_into_single_field_col_val(); - part_column_list_val *add_column_value(); + int reorganize_into_single_field_col_val(THD *thd); + part_column_list_val *add_column_value(THD *thd); bool set_part_expr(char *start_token, Item *item_ptr, char *end_token, bool is_subpart); static int compare_column_values(const void *a, const void *b); bool set_up_charset_field_preps(); bool check_partition_field_length(); - bool init_column_part(); + bool init_column_part(THD *thd); bool add_column_list_value(THD *thd, Item *item); void set_show_version_string(String *packet); partition_element *get_part_elem(const char *partition_name, |