bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2692)

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2692 Guilhem Bichot	2008-10-24
      Backport of fix made in 6.0-maria in revision guilhem@stripped
modified:
  sql/sql_class.cc

per-file messages:
  sql/sql_class.cc
    Backport of fix made in 6.0-maria in revision guilhem@stripped
    (this undoes a change made in WL 3064 (the deadlock detector patch) which asserted in
    "./mtr --embedded innodb_mysql" in 6.0-maria)
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-10 15:28:41 +0000
+++ b/sql/sql_class.cc	2008-10-24 21:39:19 +0000
@@ -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);