bk commit into 4.1 tree (reggie:1.2349) BUG#7403

[reggie]

Below is the list of changes that have just been committed into a local
4.1 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.2349 05/07/14 06:04:29 reggie@stripped +1 -0
  Bug #7403  error "Forcing close of thread 1 user: 'xxx'"
  
  The problem was that on Windows, the socket was in a blocking state 
  trying to read.  Setting killed=1 is not enough to break the 
  socket out of it's read loop.   You have to cancel the read request
  or close the socket (which close_connection does).

  sql/mysqld.cc
    1.579 05/07/14 06:03:09 reggie@stripped +1 -1
    call close_connection on the thread instead of setting killed=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/bug7403

--- 1.578/sql/mysqld.cc	2005-06-30 07:13:18 -06:00
+++ 1.579/sql/mysqld.cc	2005-07-14 06:03:09 -06:00
@@ -657,7 +657,7 @@
   {
     DBUG_PRINT("quit",("Informing thread %ld that it's time to die",
 		       tmp->thread_id));
-    tmp->killed=1;
+    close_connection(tmp, 0, 1);  
     if (tmp->mysys_var)
     {
       tmp->mysys_var->abort=1;