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 /client/mysqlbinlog.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 'client/mysqlbinlog.cc')
-rw-r--r-- | client/mysqlbinlog.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1284f520ea1..5b07232f65c 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -2443,9 +2443,6 @@ end: return retval; } -/* Used in sql_alloc(). Inited and freed in main() */ -MEM_ROOT s_mem_root; - int main(int argc, char** argv) { char **defaults_argv; @@ -2458,7 +2455,6 @@ int main(int argc, char** argv) my_init_time(); // for time functions tzset(); // set tzname - init_alloc_root(&s_mem_root, 16384, 0, MYF(0)); if (load_defaults("my", load_groups, &argc, &argv)) exit(1); @@ -2569,7 +2565,6 @@ int main(int argc, char** argv) my_fclose(result_file, MYF(0)); cleanup(); free_annotate_event(); - free_root(&s_mem_root, MYF(0)); free_defaults(defaults_argv); my_free_open_file_info(); load_processor.destroy(); @@ -2582,11 +2577,6 @@ int main(int argc, char** argv) } -void *sql_alloc(size_t size) -{ - return alloc_root(&s_mem_root, size); -} - struct encryption_service_st encryption_handler= { 0, 0, 0, 0, 0, 0, 0 |