summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc8
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;