Merge mysql.com:/home/hf/work/thfix/my41-thfix

into  mysql.com:/home/hf/work/thfix/my50-thfix


client/mysqltest.c:
  Auto merged

client/mysqltest.c

@@ -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;