BUG#12578441, reintroduced thd->cleanup() in unlink_thd, removed by mistake, added private interface to this function

1 files changed, 14 insertions, 0 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d67a04bcc23..8ea076e72ba 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2009,6 +2009,19 @@ extern "C" sig_handler end_thread_signal(int sig __attribute__((unused)))
 
 
 /*
+  Cleanup THD object
+
+  SYNOPSIS
+    thd_cleanup()
+    thd		 Thread handler
+*/
+
+void thd_cleanup(THD *thd)
+{
+  thd->cleanup();
+}
+
+/*
   Decrease number of connections
 
   SYNOPSIS
@@ -2054,6 +2067,7 @@ void unlink_thd(THD *thd)
   DBUG_ENTER("unlink_thd");
   DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
 
+  thd_cleanup(thd);
   dec_connection_count();
   mysql_mutex_lock(&LOCK_thread_count);
   delete_thd(thd);