diff options
| author | Monty <monty@mariadb.org> | 2015-08-27 10:07:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-27 22:29:11 +0300 |
| commit | 3bca8db4f90cd9a505b99009c44594c0fb1ec353 (patch) | |
| tree | a96ef13450eeb6a9b420e592534044b44872f97e /sql/partition_info.h | |
| parent | 3cb578c001b2feabd2410f281d20eb6566371453 (diff) | |
| download | mariadb-git-3bca8db4f90cd9a505b99009c44594c0fb1ec353.tar.gz | |
MDEV-6152: Remove calls to current_thd while creating Item
- Part 4: Removing calls to sql_alloc() and sql_calloc()
Other things:
- Added current_thd in some places to make it clear that it's called (easier to remove later)
- Move memory allocation from Item_func_case::fix_length_and_dec() to Item_func_case::fix_fields()
- Added mem_root to some new calls
- Fixed some wrong UNINIT_VAR() calls
- Fixed a bug in generate_partition_syntax() in case of errors
- Added mem_root to argument to new thread_info
- Simplified my_parse_error() call in sql_yacc.yy
Diffstat (limited to 'sql/partition_info.h')
| -rw-r--r-- | sql/partition_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index 8d423f6997a..df7010b2ab3 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -335,7 +335,7 @@ public: 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 set_up_charset_field_preps(THD *thd); bool check_partition_field_length(); bool init_column_part(THD *thd); bool add_column_list_value(THD *thd, Item *item); |