diff options
| author | unknown <SergeyV@selena.> | 2005-08-30 17:22:19 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-08-30 17:22:19 +0400 |
| commit | 1a170dc092f3f65b58ea4f22e3f663a470e2ab0b (patch) | |
| tree | 73279c73ea469231d037484eb34ad8ec4bc25413 /sql/sql_class.cc | |
| parent | 8dd3a7d9a7cc9320478774ae8be0e66dfc73acb0 (diff) | |
| download | mariadb-git-1a170dc092f3f65b58ea4f22e3f663a470e2ab0b.tar.gz | |
Fixes bug #12517. Clear user variables and replication events before
closing temp tables in thread cleanup.
mysql-test/r/connect.result:
added results for test of bug #12517
mysql-test/t/connect.test:
added test of bug #12517
sql/sql_class.cc:
Clear user variables and replication events before
closing temp tables in thread cleanup.
Diffstat (limited to 'sql/sql_class.cc')
| -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) |