From: Bjorn Munch
Date: September 20 2010 9:22am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2932) Bug#55426
List-Archive: http://lists.mysql.com/commits/118576
X-Bug: 55426
Message-Id: <201009200922.o8K9MnU5029309@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1447927419=="

--===============1447927419==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;
   }
 }


--===============1447927419==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/backtick-51/
# testament_sha1: 8dddbf965810552d086523d739c737fcfe017547
# timestamp: 2010-09-20 11:22:49 +0200
# base_revision_id: bjorn.munch@stripped\
#   vokfrnp2tgx7w4kn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfCvAxoAAZHfgEAQWPf/91Mj
BIC////wUAPOq8D2qtLu226CUIhTYmpsptPU000DQJ6KZNPUHqGnqHMAAAAAAAAAACUQIap+U2qB
5I00eoeppp6gaABoDJE9KYxInk9Uep5Q9BGhkAeoNGQJSCMmmINKeRqan6o2kPUGmnlNBkHqNRoK
MO3wNFXyatS2mz575ECORdLtMkTnUo3vJ71+2pRVPj2Md6zhK13tNWZRjoebX6UkmyvH54hjvtlX
K5ei2jO5mDDGKLkjXZRLPTofCaHUZRLricbpz3uonM4hVDPK7YVDps46gFBzyZObiRSSMO2tr1tm
J1pAPGyYgtJQIIOGz3uDMRej3gEiSJK5qesydVDbrkETfkLOOS1zYhCoRyx7ZT8/NOgz92syCgop
8Ni1IWUksuzMQ5kRILEI4tEzDwFD9crwZvodw0QyUFZX2sniFMStZibuAztKVFsroG5VdxGotr+I
jHXoZznrCd3UrayVg1BUyF1xLINxuqVhrBBenCopN7Qy50JhUNgEnlcB16mgooMIrMdlwnFKI8qs
FKtwFiZNNmkzB2SCs4mhBJsS6eQdSUrh1/Y+wU10G7xIvuVCkQ0CglJxvhMcTLC7vE0zhIzXRcgr
muor4sHsRY1eSBHIs/U5W8M0zmNvTDBEIsSop+Kxzv7jO7uzhT7ZbSu1Q2TcKGl/EML8V0YZIhOE
iTgx1dtKPoa5oOsT+cL4/Mt4wYNRrFbvzaGpDL7HlFNG/w7MgkIvOZwwE8K0QsbDIhyGq3TrOiF1
qdhUkmvRjr8ntczlP6jSvLr6+m1gT6SPxUjx5VyvhWb2mmDHj1tZnhQrrLKopp9yxeixqpc90zki
kf2UdP7cHts0cCpFoMBjfKaqGvyOngR7rbiU9btztLJvgC83ngRhuKFYTiJaGJneX3aLxydQClWg
ae3D4RWfuS/LBHlWDw7FGzvbmfWFl828Gb20NRHZaCZ9O9EOOwa6A5wVBxrtkWqT1BxmDWAa4kIF
i8aVQSqlg/QAkzYMJFBntiI3guVR5EjOZzZZGs3BWq1EFSFsVRB4c9TDAKmQVY1OrLAeI5SKSRDu
2E+ojqK9zQ667wSR65B82WEuqITBZgAfBpvFmaAvylQJRvRConpXc5yQudSBZRdzlhJ5nN6r4ISw
mQx8xGSJIiXhmvqZB4O6ZuVWNrbGWCkJ2At6bnd3kriHQiJah4iWxv63rbw2GpWv0GKw9gV0jeoM
QxTar8hHOGMGeyUZulZhp/PBEJbp738C0joTNgREsCnI+4PiIxoo2fqZGv5Bqaa3asMBTxMCgYGI
necikXkvErvP+LuSKcKEh4V4GNA=


--===============1447927419==--