Commit f4484a86 authored by unknown's avatar unknown

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

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


client/mysqltest.c:
  Auto merged
parents d607f40b 5d6bdebc
...@@ -222,11 +222,13 @@ struct st_connection ...@@ -222,11 +222,13 @@ struct st_connection
char *name; char *name;
MYSQL_STMT* stmt; MYSQL_STMT* stmt;
#ifdef EMBEDDED_LIBRARY
const char *cur_query; const char *cur_query;
int cur_query_len; int cur_query_len;
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
int query_done; int query_done;
#endif /*EMBEDDED_LIBRARY*/
}; };
struct st_connection connections[128]; struct st_connection connections[128];
struct st_connection* cur_con, *next_con, *connections_end; struct st_connection* cur_con, *next_con, *connections_end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment