diff options
| author | unknown <sergefp@mysql.com> | 2005-09-09 11:43:26 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-09 11:43:26 +0400 |
| commit | f32088a94188f5baf4acea10067643d9352c6d23 (patch) | |
| tree | c54b6002c43d7a4368483f64633386bae79adec0 /sql/sql_class.cc | |
| parent | 20994fec52db1d95b085704c424ef5d292c9a307 (diff) | |
| download | mariadb-git-f32088a94188f5baf4acea10067643d9352c6d23.tar.gz | |
Post-merge fixes. Call sp_cache_clear in THD::cleanup.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 4ed8d61a2be..975014b9780 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -383,8 +383,10 @@ void THD::cleanup(void) 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)); + sp_cache_clear(&sp_proc_cache); - sp_cache_clear(&sp_func_cache); /*psergey: move to ~THD? */ + sp_cache_clear(&sp_func_cache); + if (global_read_lock) unlock_global_read_lock(this); if (ull) @@ -424,9 +426,6 @@ THD::~THD() ha_close_connection(this); - sp_cache_clear(&sp_proc_cache); - sp_cache_clear(&sp_func_cache); - DBUG_PRINT("info", ("freeing host")); if (host != my_localhost) // If not pointer to constant safeFree(host); |