diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-10-24 23:39:19 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-10-24 23:39:19 +0200 |
| commit | f2d8af59f6f35febf798208e715bbe8931127aee (patch) | |
| tree | 145f99065f7c79bfe6fa5dc3aa92b4942a5bfefd /sql/sql_class.cc | |
| parent | 14c146618707540c46e1ab1c8b8f103913e1237a (diff) | |
| download | mariadb-git-f2d8af59f6f35febf798208e715bbe8931127aee.tar.gz | |
Backport of fix made in 6.0-maria in revision guilhem@mysql.com-20081020202418-yay1h55w9ffagp42
sql/sql_class.cc:
Backport of fix made in 6.0-maria in revision guilhem@mysql.com-20081020202418-yay1h55w9ffagp42
(this undoes a change made in WL 3064 (the deadlock detector patch) which asserted in
"./mtr --embedded innodb_mysql" in 6.0-maria)
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a88d0ce5dd1..9a450f245be 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -896,12 +896,13 @@ THD::~THD() #endif stmt_map.reset(); /* close all prepared statements */ DBUG_ASSERT(lock_info.n_cursors == 0); - ha_close_connection(this); - plugin_thdvar_cleanup(this); if (!cleanup_done) cleanup(); + ha_close_connection(this); + plugin_thdvar_cleanup(this); + DBUG_PRINT("info", ("freeing security context")); main_security_ctx.destroy(); safeFree(db); |