From: Bjorn Munch
Date: September 14 2010 12:50pm
Subject: bzr push into mysql-next-mr-mtr branch (bjorn.munch:2976 to 2977)
List-Archive: http://lists.mysql.com/commits/118206
Message-Id: <201009141250.o8ECoxKk021701@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0873273081=="

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

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

    modified:
      client/mysqltest.cc
 2976 Bjorn Munch	2010-09-02 [merge]
      upmerge 56383

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-02 08:06:12 +0000
+++ b/client/mysqltest.cc	2010-09-14 12:49:32 +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*/
@@ -5219,6 +5225,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()");
@@ -7357,11 +7364,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
   */


--===============0873273081==
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-nx/
# testament_sha1: c867b11d625ab96923ab5c1bf98363ae7e0bcfa5
# timestamp: 2010-09-14 14:50:59 +0200
# source_branch: file:///home/bm136801/my/mysql-next-mr/
# base_revision_id: bjorn.munch@stripped\
#   5x2w331tmrr9obh2
# 
# Begin bundle
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


--===============0873273081==--