Commit c18a34bd authored by Bjorn Munch's avatar Bjorn Munch

Bug #55426 mysqltest crashes when trying to unlock not acquired mutex

Follow-up: don't call pthread_join() on Windows
This change only valid for 5.1
parent 6ff48a61
...@@ -763,7 +763,10 @@ static void wait_query_thread_end(struct st_connection *con) ...@@ -763,7 +763,10 @@ static void wait_query_thread_end(struct st_connection *con)
} }
if (con->has_thread) if (con->has_thread)
{ {
#ifndef __WIN__
/* May hang on Windows, but the problem it solves is not seen there */
pthread_join(con->tid, NULL); pthread_join(con->tid, NULL);
#endif
con->has_thread= FALSE; con->has_thread= FALSE;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment