From 57ef3cccf3498f3d5d3b6a4fabd368790a09b335 Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Tue, 15 Aug 2000 11:42:09 -0600
Subject: [PATCH 1/2] bookkeeping commit - bk will not let me pull Monty's
 changes until I commit mine to my repository - this will not be pushed

---
 sql/mysqld.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 179c7ecd9dc..5a306a0923b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -876,8 +876,9 @@ void end_thread(THD *thd, bool put_in_cache)
   thread_count--;
   delete thd;
   
-  if (cached_thread_count < thread_cache_size && ! abort_loop &&
-      !kill_cached_threads)
+  if (put_in_cache && cached_thread_count < thread_cache_size
+      && ! abort_loop &&
+      !kill_cached_threads )
   {
     /* Don't kill the thread, just put it in cache for reuse */
     DBUG_PRINT("info", ("Adding thread to cache"))
@@ -891,8 +892,8 @@ void end_thread(THD *thd, bool put_in_cache)
     {
       wake_thread--;
       thd=thread_cache.get();
-      threads.append(thd);
       (void) thd->store_globals();
+      threads.append(thd);
       pthread_mutex_unlock(&LOCK_thread_count);
       DBUG_VOID_RETURN;
     }

From 5e996d2753df1aa9b524e66ebb74856da3779bd2 Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Tue, 15 Aug 2000 11:46:20 -0600
Subject: [PATCH 2/2]  another bookkeeping commit - will not be pushed

---
 sql/sql_parse.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 0c7b0b8187f..ae36c419750 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -245,6 +245,7 @@ check_connections(THD *thd)
     int2store(end+3,thd->server_status);
     bzero(end+5,13);
     end+=18;
+    net->timeout = net_read_timeout;
     if (net_write_command(net,protocol_version, buff,
 			  (uint) (end-buff)) ||
        (pkt_len=my_net_read(net)) == packet_error ||