bk commit into 5.0 tree (reggie:1.1949)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of reggie. When reggie does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1949 05/07/15 08:37:15 reggie@stripped +1 -0
  Merge linux.site:/home/reggie/bk/bug7403
  into  linux.site:/home/reggie/bk/mysql-5.0

  sql/mysqld.cc
    1.479 05/07/15 08:37:07 reggie@stripped +0 -1
    merging in changes from 4.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	reggie
# Host:	linux.site
# Root:	/home/reggie/bk/mysql-5.0/RESYNC

--- 1.478/sql/mysqld.cc	2005-07-03 18:44:31 -06:00
+++ 1.479/sql/mysqld.cc	2005-07-15 08:37:07 -06:00
@@ -685,7 +685,13 @@
   {
     DBUG_PRINT("quit",("Informing thread %ld that it's time to die",
 		       tmp->thread_id));
-    tmp->killed= THD::KILL_CONNECTION;
+    /* 
+     Re: bug 7403 - close_connection will be called mulitple times
+     bug a wholesale clean up of our network code is a very large 
+     project.  This will wake up the socket on Windows and prevent the
+     printing of the error message that we are force closing a connection.
+    */
+    close_connection(tmp, 0, 1);  
     if (tmp->mysys_var)
     {
       tmp->mysys_var->abort=1;