diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-04 19:06:42 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-04 19:06:42 +0100 |
| commit | c0612e453e3364255a1f88c7f3ac4849fb8965df (patch) | |
| tree | d1ad41db4406b4986f9f3b7475df088707a265be /client | |
| parent | 33fc8d50640ddfbece9142126ee5909139a57bf3 (diff) | |
| parent | 0184996b991dbb0d27e8a709894db0109f539a8d (diff) | |
| download | mariadb-git-c0612e453e3364255a1f88c7f3ac4849fb8965df.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.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 2dcf718918e..c6cbf6aabe0 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; |