From: Bjorn Munch
Date: September 14 2010 12:20pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3087)
List-Archive: http://lists.mysql.com/commits/118199
Message-Id: <201009141220.o8ECKWJC019149@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0962640320=="

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

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

 3087 Bjorn Munch	2010-09-14 [merge]
      upmerge 55426(55546), 56647

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-01 13:49:43 +0000
+++ b/client/mysqltest.cc	2010-09-14 12:19:51 +0000
@@ -252,7 +252,9 @@ struct st_connection
   int cur_query_len;
   pthread_mutex_t mutex;
   pthread_cond_t cond;
+  pthread_t tid;
   int query_done;
+  my_bool has_thread;
 #endif /*EMBEDDED_LIBRARY*/
 };
 
@@ -732,8 +734,6 @@ pthread_handler_t send_one_query(void *a
 static int do_send_query(struct st_connection *cn, const char *q, int q_len,
                          int flags)
 {
-  pthread_t tid;
-
   if (flags & QUERY_REAP_FLAG)
     return mysql_send_query(&cn->mysql, q, q_len);
 
@@ -744,9 +744,10 @@ static int do_send_query(struct st_conne
   cn->cur_query= q;
   cn->cur_query_len= q_len;
   cn->query_done= 0;
-  if (pthread_create(&tid, &cn_thd_attrib, send_one_query, (void*)cn))
+  if (pthread_create(&cn->tid, &cn_thd_attrib, send_one_query, (void*)cn))
     die("Cannot start new thread for query");
 
+  cn->has_thread= TRUE;
   return 0;
 }
 
@@ -759,6 +760,11 @@ static void wait_query_thread_end(struct
       pthread_cond_wait(&con->cond, &con->mutex);
     pthread_mutex_unlock(&con->mutex);
   }
+  if (con->has_thread)
+  {
+    pthread_join(con->tid, NULL);
+    con->has_thread= FALSE;
+  }
 }
 
 #else /*EMBEDDED_LIBRARY*/
@@ -5217,6 +5223,7 @@ void do_connect(struct st_command *comma
 
 #ifdef EMBEDDED_LIBRARY
   con_slot->query_done= 1;
+  con_slot->has_thread= FALSE;
 #endif
   if (!mysql_init(&con_slot->mysql))
     die("Failed on mysql_init()");
@@ -7353,11 +7360,10 @@ void run_query(struct st_connection *cn,
                            (flags & QUERY_REAP_FLAG));
   DBUG_ENTER("run_query");
 
-  init_dynamic_string(&ds_warnings, NULL, 0, 256);
-
   if (cn->pending && (flags & QUERY_SEND_FLAG))
     die ("Cannot run query on connection between send and reap");
 
+  init_dynamic_string(&ds_warnings, NULL, 0, 256);
   /*
     Evaluate query if this is an eval command
   */


--===============0962640320==
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/mtr-55/
# testament_sha1: 2f9f01583f3a1f127b1aab6fc59720e21cbc8069
# timestamp: 2010-09-14 14:20:32 +0200
# source_branch: file:///home/bm136801/my/mysql-5.5/
# base_revision_id: bjorn.munch@stripped\
#   927op2nd3bxmmydu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSp6yiEABUXfgEAQWXf//3NH
X0C////6YAjO9Pfe9563tarL17229LvJ21fbq7YNsNSYSSKejQpmmg0niajJPKB+lNqbU0AaAZPU
GlR5T1NGRiPU9JoDJpoAA0AANGQZKZiJqeonpGI0AAAAAAAASRNQZTE9JqmMiPUNDRoAAAaG1AEU
kMgIE0zUZNE9ImxGoNNGTEAAEkQgAJij0BJ6p5T1PyU9E9R6jQGgB6hxVka4VgUNz+3f4jeB73Nq
U9tk/OBiYOjE4Vl8b72l6tfr9/w3JTYOdnxfayrDYkhGmOhNqzupSB5q2rF8nAq6hqU+L6N90S7H
Y6WFiCIYhaur5A4/zNuaBV5bG2STmZtteRFjzGfB4k2lkXzieFl1Hv0OMwijUa+mpnlJgvaVC76L
pMw1D0wzI3vu6us2+PmLbuv85RvGzHb7/p1pUGDMZ4zwTrILQNqH2tZ4lMV03UGopdAL2fZhjjhZ
fK04a5c1zWC4qnws7uHzcgIymgAXL3s2eTNLTBzK+OaJCRzfLjIVPqmxael7v3pF2CAgv6bdQjeg
12QGDDJrHrGHm6NgnHY6q54TuEzRDBEORNOTu7u/LLLo6KXiDewEMSTb2gWQoARW6FJ2E4gIE4iQ
Nq5+i2CbOId64DG8FuKA44XlcEMwCNlgSTEzqFExAmKBCXaSiCxNi1FdaqChrGRDK+HUQKxYxVWA
IdhSEVkfDC4S0O8dng1F4lpATpNo+B2DScwCRgwGdOMt0K85ltEXTFFYU5O/RBkAZBgtijVEaqhx
bcn8jGHbk+QmmUvJgOnK5m41rdm23USgVBYZHZBya+RTL1FmmEBRAReShAU9BcN2nETp5jga2lQZ
PBqNXRTxG+mRNvhoXmixzqkYQcIylftiIvLM3yOtRG1pjBqBGi7FkhUCbFsdK6HqIM0ZN+CWjFDb
G0SLcWTYa2GsTG4qKxL9zW5qxdkXGAjuVsmxntnukw5TZCIjOaeABPutgEldk+lqniIxWmGBfBzR
/hQG6kYl2aZuIws7GaokDLMT35hsO5or79hixQmsVncuUWGVayHMJyecNAWM62kzqpUcBHJYVsK8
kYmavquIFILX2NGcol72lHeuWGakWS2eM9xGIitOy42ToveVPwEW6CRoiO7coixKte3bmSd3muEW
RuGlZU9V8p7tB4Keoak4ArBFjlZQ0YTq8pWrQ6BqTtPUQSstMUB2wQoTBqDCmmRBAmgZs67ifpc+
7b1qWkFjBiwX+5Y4lt0xptFopkFWs9eBoPXhOt4v+FTK2p9j7jQQo4tOHE4Z1sARw4yQKC+JhLjk
lJ436WFM02YQ6xp1Z8xv1EOmCzXS0IIEbspBtaU1GwpwLVzInimHHclKyewT25wWFxkcXSrrai4x
RdFU4tSakVKF7KprdjFjcyWxkhDNisaCTowzmdJ8/ZERrftGtszdzIzriIipgfF+LsesfNEPoYXj
JhhhMzNjyBJv1wayq9RB9y4hHVwtJRw6zhE8/i2p2plcoDCGb784il4Ew8hUkyDw7nXTidBGzsUp
vk4b3GFEsfPw+CEFOkFK50WIvwbMpRFNfdHjxPF1tiJVJROoPMmVJfEtRJgEgy8uWObWxWccLuV1
+Y91BKJNxib/YXrPVl33neNYabsQPsMhnQw4zoYcZ/8X57ZiK5arXzEJl+ImL5tn0YEmc3jmlW7g
XEzENxmb/nHE71Eu5CV76mSIfi/DL+zJENz9PFoRY18OAvqQ3A1Tx1KrT7JOuZO1GsnV86hG/YIj
OlHkVoJ3t3zLxrwBkHV1FjnQUw/BuWa5jDUEdcmh3AXNbo7KlyWPo0KYReRqvt7l2u6HgIz3Ekev
ws0KXWg6Q7CFVGVT1lBI5Lmb8jnE9V8E8WZg0TmaxEGTqIheYCAYBO16odUBoUuWAqETnCdQsYkB
1lc4XSS0zpq1noi9UVZfJYhbra9VOzJ1rpFa+1A9A57XuU8d6ufO7DBo2ow37BMhyB3TEm+ptIdw
7NoTjeFuO412HTim6jc42ipF2raohnYkYME25yuUHsqBJVDvkjm2Gl6YQTkD3YQ14ffZ8vW2KWic
9aFAMVJPechrl1ieibyQOt2SisiArVtQaEhQUxRIIfTm2wMhAmb2WrUplMCs3bwXNyoK1pFK9PAd
5+D7UQ9T2bYD6hOLyzbhKq29pwxtB5ugGpqB5VuKIQPCmnQN7Ngzc3pyvO0HQ4dsKBtbZOK6sXT4
8XEazqbX2tLbGgyj7kQrwEi1g4DHvczHHQyxIxsJG6ZBATRCGu50DUtl7zMnBhEL+tgTEiPXcGN1
i4uRIuvsz9bYVghmQMgtF58dQss26P3/cbDjHsARiyuBNz7VtJMEyynNCCoQ4DGAjY9ZWFqM2Ker
0Z7DWN70oTcHy1ju5sMIUH0icbXlqpLiytfKXvg3OTa7nUD0CcOOg6dW2E5CVqpmzl5Ke4qO65Xa
+L0DgY5XSKnSOKqXGuzlbU1UZpEDLyquy7aquNU8Epi+VrBojbLWSgIiNLbTIGpvb4YhiVvVfFMv
EF6CuVO5wBrhFI0VbbkyaRMnZQEeQl82hY+wb6PhwEoWNd/V0OzcD3yGT2T11wnBK1G/0Jr1mKMA
uEOg81wviR0mogg0Vm4PH4KgT6KOojyVyEFmF0OgphRMr0HbEF0+vkIh7xOJj1x7hrZjqZDN0FsP
YPLMe5rTtfMaIeHYGzyZLoEtDaNVRxGsHv3+Y8xwG7i+jYGl8BlWcVp/xdyRThQkCp6yiEA=


--===============0962640320==--