bzr commit into mysql-6.0 branch (guilhem:2743)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/

 2743 Guilhem Bichot	2008-10-20
      Undoing change done in WL 3064 (the deadlock detector patch) which asserted in --embedded.
modified:
  sql/sql_class.cc

per-file messages:
  sql/sql_class.cc
    Undoing change done in WL 3064 (the deadlock detector patch). Closing the connection in InnoDB
    early led to InnoDB's rollback seeing there is no more transaction object, and asserting;
    it made tests (main.autocommit_func etc) fail with --embedded
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-20 19:13:22 +0000
+++ b/sql/sql_class.cc	2008-10-20 20:24:18 +0000
@@ -935,15 +935,12 @@ 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();
 
   mdl_context_destroy(&mdl_context);
   mdl_context_destroy(&handler_mdl_context);
-
+  ha_close_connection(this);
   mysql_audit_release(this);
   plugin_thdvar_cleanup(this);