Merge linux.site:/home/reggie/bk/bug7403

into  linux.site:/home/reggie/bk/mysql-5.0

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 78d9af387da..a9a81b47cda 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -685,7 +685,13 @@ static void close_connections(void)
   {
     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;