diff options
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 2ff0413e05e..4ed8d61a2be 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -377,14 +377,14 @@ void THD::cleanup(void) mysql_ha_flush(this, (TABLE_LIST*) 0, MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL); hash_free(&handler_tables_hash); + delete_dynamic(&user_var_events); + hash_free(&user_vars); close_temporary_tables(this); my_free((char*) variables.time_format, MYF(MY_ALLOW_ZERO_PTR)); my_free((char*) variables.date_format, MYF(MY_ALLOW_ZERO_PTR)); my_free((char*) variables.datetime_format, MYF(MY_ALLOW_ZERO_PTR)); - delete_dynamic(&user_var_events); - hash_free(&user_vars); sp_cache_clear(&sp_proc_cache); - sp_cache_clear(&sp_func_cache); + sp_cache_clear(&sp_func_cache); /*psergey: move to ~THD? */ if (global_read_lock) unlock_global_read_lock(this); if (ull) |