summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
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/tztime.cc
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/tztime.cc')
-rw-r--r--sql/tztime.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 5e5f34f29a5..f94e10c4877 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1800,8 +1800,6 @@ end:
delete thd;
if (org_thd)
org_thd->store_globals(); /* purecov: inspected */
- else
- my_pthread_setspecific_ptr(THR_MALLOC, 0);
default_tz= default_tz_name ? global_system_variables.time_zone
: my_tz_SYSTEM;