diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 11:25:22 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 11:25:22 +0100 |
| commit | 37d0126b994d977dfc08838b1fb68e8b80c58d87 (patch) | |
| tree | b8b0b8117c3c83cb85ff2f054b6058055c11c6db /client | |
| parent | 00fec63a38f90d873a18e849cf0dc191d1ad42eb (diff) | |
| parent | 6c0ff6c236ce096061f3db181e1469917781731d (diff) | |
| download | mariadb-git-37d0126b994d977dfc08838b1fb68e8b80c58d87.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
mysql-test/t/group_min_max.test:
Auto merged
sql/opt_range.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 2063d31251d..315cf043d86 100644 --- a/client/mysqltest.c +++ b/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; |