Merge mysql.com:/home/kostja/mysql/mysql-4.1-root

into  mysql.com:/home/kostja/mysql/mysql-5.0-merge


client/mysqltest.c:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/timezone_grant.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
mysql-test/r/olap.result:
  Manual merge
mysql-test/t/olap.test:
  Manual merge
mysql-test/t/select.test:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 035f098c88c..7c8b2b781e4 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
+      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, 0);
     if (tmp->mysys_var)
     {
       tmp->mysys_var->abort=1;