diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-20 11:21:27 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-20 11:21:27 +0200 |
| commit | c679e8dc800a11cf3271c314097e5d9dd71b9068 (patch) | |
| tree | 8a227ee82035d503f178052e09de66fef6adcdf5 /client | |
| parent | 38604de3a0fec8a3ff73b2e3c945617a1388759e (diff) | |
| download | mariadb-git-c679e8dc800a11cf3271c314097e5d9dd71b9068.tar.gz | |
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
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 3 |
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; } } |