Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into  mockturtle.local:/home/dlenev/src/mysql-4.1-merge

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 0efc1339467..20f20a0a86b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1572,6 +1572,12 @@ void end_thread(THD *thd, bool put_in_cache)
       thd=thread_cache.get();
       thd->real_id=pthread_self();
       (void) thd->store_globals();
+      /*
+        THD::mysys_var::abort is associated with physical thread rather
+        than with THD object. So we need to reset this flag before using
+        this thread for handling of new THD object/connection.
+      */
+      thd->mysys_var->abort= 0;
       thd->thr_create_time= time(NULL);
       threads.append(thd);
       pthread_mutex_unlock(&LOCK_thread_count);