bk commit into 5.0 tree (holyfoot:1.2317)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-29 09:24:35+04:00, holyfoot@stripped +1 -0
  Merge mysql.com:/home/hf/work/thfix/my41-thfix
  into  mysql.com:/home/hf/work/thfix/my50-thfix
  MERGE: 1.1616.2843.14

  client/mysqltest.c@stripped, 2006-11-29 09:24:31+04:00, holyfoot@stripped +0 -0
    Auto merged
    MERGE: 1.92.23.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/thfix/my50-thfix/RESYNC

--- 1.259/client/mysqltest.c	2006-11-29 09:24:43 +04:00
+++ 1.260/client/mysqltest.c	2006-11-29 09:24:43 +04:00
@@ -222,11 +222,13 @@ struct st_connection
   char *name;
   MYSQL_STMT* stmt;
 
+#ifdef EMBEDDED_LIBRARY
   const char *cur_query;
   int cur_query_len;
   pthread_mutex_t mutex;
   pthread_cond_t cond;
   int query_done;
+#endif /*EMBEDDED_LIBRARY*/
 };
 struct st_connection connections[128];
 struct st_connection* cur_con, *next_con, *connections_end;