merge

c7ff4e10 · Sergei Golubchik · 55721e4a · 8e62ad2f · c7ff4e10
Commit c7ff4e10 authored Oct 27, 2008 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/sql_class.cc sql/sql_class.cc +3 -2

No files found.
--- 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);