diff options
| author | unknown <SergeyV@selena.> | 2005-09-08 12:12:21 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-09-08 12:12:21 +0400 |
| commit | ad754b05e6f40e5a8f31f2ae1c3355b0394b5315 (patch) | |
| tree | 72c590f216056dfabb6ffb897e0714566e81264b /sql | |
| parent | f5df855f3cb8fbc596b987af5b70857979ce0ed9 (diff) | |
| parent | 34422f78c17ced6ae43a030a4d772273b7406405 (diff) | |
| download | mariadb-git-ad754b05e6f40e5a8f31f2ae1c3355b0394b5315.tar.gz | |
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into selena.:H:/MYSQL/src/#12517-mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index e845769d7ad..11b45b848c8 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -353,12 +353,12 @@ 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); if (global_read_lock) unlock_global_read_lock(this); if (ull) |