summaryrefslogtreecommitdiff
path: root/sql/thr_malloc.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2015-11-19 16:50:09 +0400
committerSergey Vojtovich <svoj@mariadb.org>2015-11-26 11:34:17 +0400
commit54689e1d5c358851c93d928c8ec453c929921f42 (patch)
treea52d829b99f79ffc1338947b95238eb12ab2dbd9 /sql/thr_malloc.h
parent753d1f868c0fd52c2ec44a97fe116c01a38d5ffd (diff)
downloadmariadb-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/thr_malloc.h')
-rw-r--r--sql/thr_malloc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/thr_malloc.h b/sql/thr_malloc.h
index d35207c655a..fc23c87c9fd 100644
--- a/sql/thr_malloc.h
+++ b/sql/thr_malloc.h
@@ -22,8 +22,7 @@ typedef struct st_mem_root MEM_ROOT;
void init_sql_alloc(MEM_ROOT *root, uint block_size, uint pre_alloc_size,
myf my_flags);
-void *sql_alloc(size_t);
-char *sql_strmake_with_convert(const char *str, size_t arg_length,
+char *sql_strmake_with_convert(THD *thd, const char *str, size_t arg_length,
CHARSET_INFO *from_cs,
size_t max_res_length,
CHARSET_INFO *to_cs, size_t *result_length);