Commit a73e04bb authored by unknown's avatar unknown
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

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


client/mysqltest.c:
  Auto merged
parents 95b72158 a708ae1b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -224,11 +224,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;