From: Bjorn Munch
Date: September 14 2010 11:23am
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:2967)
List-Archive: http://lists.mysql.com/commits/118191
Message-Id: <201009141123.o8EBNhOQ004571@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0043245809=="

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

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

 2967 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 14:02:56 +0000
+++ b/client/mysqltest.cc	2010-09-14 11:23:14 +0000
@@ -252,6 +252,7 @@ struct st_connection
   int cur_query_len;
   pthread_mutex_t mutex;
   pthread_cond_t cond;
+  pthread_t tid;
   int query_done;
 #endif /*EMBEDDED_LIBRARY*/
 };
@@ -732,8 +733,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,7 +743,7 @@ 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");
 
   return 0;
@@ -759,6 +758,11 @@ static void wait_query_thread_end(struct
       pthread_cond_wait(&con->cond, &con->mutex);
     pthread_mutex_unlock(&con->mutex);
   }
+  if (con->tid)
+  {
+    pthread_join(con->tid, NULL);
+    con->tid= 0;
+  }
 }
 
 #else /*EMBEDDED_LIBRARY*/
@@ -5219,6 +5223,7 @@ void do_connect(struct st_command *comma
 
 #ifdef EMBEDDED_LIBRARY
   con_slot->query_done= 1;
+  con_slot->tid= 0;
 #endif
   if (!mysql_init(&con_slot->mysql))
     die("Failed on mysql_init()");
@@ -7357,11 +7362,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
   */


--===============0043245809==
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-tr/
# testament_sha1: 874bd85516dec1efc646279edc002a52db6c0d47
# timestamp: 2010-09-14 13:23:43 +0200
# source_branch: file:///home/bm136801/my/mysql-trunk/
# base_revision_id: bjorn.munch@stripped\
#   vsgd9kezqdg5oys1
# 
# Begin bundle
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


--===============0043245809==--