diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-24 12:35:32 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-10-24 12:35:32 +0500 |
| commit | 7e2336925fa6dd1bab052f9b3bc5594f2d22f25b (patch) | |
| tree | bc2c0a489f18d601dea6be00f02ee8d21d13b133 /client | |
| parent | 4ddb48c619c5fb703a846f5dd2659a4854a8c0d7 (diff) | |
| download | mariadb-git-7e2336925fa6dd1bab052f9b3bc5594f2d22f25b.tar.gz | |
merging fix
client/mysqltest.c:
wrong 'while' was added instead of 'if'
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 6889ae1a84c..3294612f7cc 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1907,7 +1907,7 @@ int close_connection(struct st_query *q) #ifndef EMBEDDED_LIBRARY if (q->type == Q_DIRTY_CLOSE) { - while (con->mysql.net.vio) + if (con->mysql.net.vio) { vio_delete(con->mysql.net.vio); con->mysql.net.vio = 0; @@ -2908,7 +2908,7 @@ static int run_query_normal(struct connection *cn, struct st_query* q, else if (flags & QUERY_REAP) { pthread_mutex_lock(&cn->mutex); - if (!cn->query_done) + while (!cn->query_done) pthread_cond_wait(&cn->cond, &cn->mutex); pthread_mutex_unlock(&cn->mutex); } |