From: Bjorn Munch
Date: September 9 2010 12:55pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2929) Bug#55546
List-Archive: http://lists.mysql.com/commits/117869
X-Bug: 55546
Message-Id: <201009091255.o89CtQxU016401@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0504240793=="

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

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

 2929 Bjorn Munch	2010-09-09
      Bug #55546 mysqltest fails to create a new thread on HPUX
      Looks like we have to pthread_join().
      Added necessary code but only for HPUX

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-30 09:26:40 +0000
+++ b/client/mysqltest.cc	2010-09-09 12:54:26 +0000
@@ -243,6 +243,9 @@ struct st_connection
   pthread_mutex_t mutex;
   pthread_cond_t cond;
   int query_done;
+#if defined(HPUX10) || defined(HPUX11)
+  pthread_t tid;
+#endif /* HPUX */
 #endif /*EMBEDDED_LIBRARY*/
 };
 
@@ -748,6 +751,9 @@ static int do_send_query(struct st_conne
   if (pthread_create(&tid, &cn_thd_attrib, send_one_query, (void*)cn))
     die("Cannot start new thread for query");
 
+#if defined(HPUX10) || defined(HPUX11)
+  cn->tid= tid;
+#endif /* HPUX */
   return 0;
 }
 
@@ -760,6 +766,10 @@ static void wait_query_thread_end(struct
       pthread_cond_wait(&con->cond, &con->mutex);
     pthread_mutex_unlock(&con->mutex);
   }
+#if defined(HPUX10) || defined(HPUX11)
+  /* Only need to do this on HPUX, Bug #55546 */
+  pthread_join(con->tid, 0); 
+#endif /* HPUX */
 }
 
 #else /*EMBEDDED_LIBRARY*/


--===============0504240793==
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/hpthr-51/
# testament_sha1: f496387a5bbd578c782817c2a5da2896d20486d0
# timestamp: 2010-09-09 14:55:26 +0200
# base_revision_id: bjorn.munch@stripped\
#   n3nqi74m9dwtp34s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW6oYugAAcPfgAAQWHf//3JG
wkC////0UAQG9DrZtzVWRzkJRTI0ExMmEyU2YqP1Rh6pj0gh6mh6gkpNFPaaZEyMmgRoyNAAAGgC
SQBE0ZTZIyNGiYDSaA0GQ9IcwCYATAACYAAmAAJJIFPDU01P1BMmeqaaGajQAAaBuuNieun9KLJS
BbySywcVLBD9pxBbbmXDH1YzY8HiRQo7ak1WnBRVS/21Oj8kavclNsCcGJSP85JP1gjwvoUdnHFe
6dplH8M709tXI+Po6NNErLhwO/0d86ZjpXTht0a2lVOZGA1CyViaSK0Uq9tgTBRyvPkRDLYT5hOl
gQGXPdpydSaySKpG0L0OpBnpdTZA3c3UWkAXdjMjAYREd0YFZRPhe4LBhPE1FJMmct290Oaeccye
pbFISnNepr7ZJz65hNMYpjoYwXzPasbiW/nwKwpZfXKBjRsoeYzCG1cDXrxM4znWCkWC18fcRjxQ
TwpxyBzxFXbUVlLSqRSH1NoyK8zxyDa8Mpsw03mi04ljTHOosYivppwYPciiD5PQ0TPjGIz1Oa1m
Nt7TsWufljSXFgqXjiYMGYlPAeWBorDPdQYqMDSM8TWUNJLSy7QQLLE07hOHsIkVEom11Ttar7mS
pmVj3311r+JYcEMeackRDE3tnpsIuH6s1KxTAFxlbQ8f4Ktatg4v4no0ZQ5GaGDybk0mgUCU20nf
f5D6+HHug5jZuhrNyRVQzJj16HtK4XYKZx7AvoFvBW4eDCKHOVo2K1oY3YZP578Hd2iIToTvBF20
UNihQdeRLt+tHzJjMyqyMziGJkK9+F4YCR/crj3CbEYMG9X+Yl6C5ZsyR25mE1Ei7sfs+JaUZKu7
CTuqFyitg54qLprnKI2pyYnXSCOLimcnj6a6/RoItm+jlWUd42p0/h3/JxS7PcG8N7WpdmU3i6Od
3Fe0JCh1zg2Pq4+65rjYmVmWma/lDbugB6wjClqNpcItJLbdxyGFsJ23QWiTPJmYi7zETHWhwlyB
KWPS5yLUMWwWozQ72XBO1v1LnTEmjIrpy2BMEwrb8fDJANeoGjcbRTYYHbtSI8Zpy56AdVjv0hQ8
HyBJUkMVDuLPijPEKYjxFyatV5KGqMIHikXcZ5bBVoWOHYM9IaSYnfayRMOJeNRSgJps6j+HiqCi
yZdx59XWttma/5C9zPAFoGzB5P4UM3BIuBysBeb1by9KevG3azKJKevGPfNW1nuUAfpdmTUluaF8
yIbYjtzHj0lbLGaWhiqw2uoNrmKK0wcDJ1q2eLNYaylJ6KMUc8MBqlk+BrZKrAuGMrVUfr1aLhMM
SMJE7kV9Unr8Cox65IhHhkbynYjwQiLmbVlRS+8uoNIUypKr1XFgwVwizilQdBRMCgmvyOIchPUf
iuX+LuSKcKEg3VDF0A==


--===============0504240793==--