summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/mysqltest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index a84ad2ad9e8..08375e4a576 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -763,7 +763,10 @@ static void wait_query_thread_end(struct st_connection *con)
}
if (con->has_thread)
{
+#ifndef __WIN__
+ /* May hang on Windows, but the problem it solves is not seen there */
pthread_join(con->tid, NULL);
+#endif
con->has_thread= FALSE;
}
}