bzr commit into mysql-5.1-mtr branch (bjorn.munch:2932) Bug#55426

[Bjorn Munch]

#At file:///home/bm136801/my/backtick-51/ based on revid:bjorn.munch@stripped

 2932 Bjorn Munch	2010-09-20
      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

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-15 12:56:22 +0000
+++ b/client/mysqltest.cc	2010-09-20 09:21:27 +0000
@@ -763,7 +763,10 @@ static void wait_query_thread_end(struct
   }
   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;
   }
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]