diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-11-19 16:50:09 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-11-26 11:34:17 +0400 |
| commit | 54689e1d5c358851c93d928c8ec453c929921f42 (patch) | |
| tree | a52d829b99f79ffc1338947b95238eb12ab2dbd9 /sql/sql_partition.cc | |
| parent | 753d1f868c0fd52c2ec44a97fe116c01a38d5ffd (diff) | |
| download | mariadb-git-54689e1d5c358851c93d928c8ec453c929921f42.tar.gz | |
MDEV-8715 - Obsolete sql_alloc() in favor of THD::alloc() and thd_alloc()
The following left in semi-improved state to keep patch size reasonable:
- Field operator new: left thd_alloc(current_thd)
- Sql_alloc operator new: left thd_alloc(thd_get_current_thd())
- Item_args constructors: left thd_alloc(thd)
- Item_func_interval::fix_length_and_dec(): no THD arg, have to call current_thd
- Item_func_dyncol_exists::val_int(): same
- Item_dyncol_get::val_str(): same
- Item_dyncol_get::val_int(): same
- Item_dyncol_get::val_real(): same
- Item_dyncol_get::val_decimal(): same
- Item_singlerow_subselect::fix_length_and_dec(): same
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index c155d74b7d8..832f218fb51 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -2468,7 +2468,7 @@ static int add_key_with_algorithm(File fptr, partition_info *part_info, common queries. */ -char *generate_partition_syntax(partition_info *part_info, +char *generate_partition_syntax(THD *thd, partition_info *part_info, uint *buf_length, bool use_sql_alloc, bool show_partition_options, @@ -2642,7 +2642,7 @@ char *generate_partition_syntax(partition_info *part_info, goto close_file; *buf_length= (uint)buffer_length; if (use_sql_alloc) - buf= (char*) sql_alloc(*buf_length+1); + buf= (char*) thd->alloc(*buf_length + 1); else buf= (char*) my_malloc(*buf_length+1, MYF(MY_WME)); if (!buf) |