diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-07 15:34:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-07 15:34:59 +0200 |
| commit | 742899e59d4d1c4ec8d32c140fe7ac4b134757e4 (patch) | |
| tree | d73caaee6cc88a1837f0e2674779472f8f4ef84d /sql/sql_class.cc | |
| parent | 6625fad8ca9fdb3e9b473bb597f93baa757366ea (diff) | |
| download | mariadb-git-742899e59d4d1c4ec8d32c140fe7ac4b134757e4.tar.gz | |
MDEV-4480 Assertion `inited == NONE' fails on closing a connection with open handler on temporary table
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index ca17cefff4c..94e58473a5e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1390,6 +1390,8 @@ void THD::cleanup(void) } #endif + mysql_ha_cleanup(this); + close_temporary_tables(this); transaction.xid_state.xa_state= XA_NOTR; @@ -1397,7 +1399,6 @@ void THD::cleanup(void) xid_cache_delete(&transaction.xid_state); locked_tables_list.unlock_locked_tables(this); - mysql_ha_cleanup(this); DBUG_ASSERT(open_tables == NULL); /* |