1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging fix

Browse Source
This commit is contained in:
holyfoot/hf@mysql.com/deer.(none) 2006-10-24 12:35:32 +05:00
parent 4d23559806
commit 836e159ff3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqltest.c
View File

@ -1907,7 +1907,7 @@ int close_connection(struct st_query *q)
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (q->type == Q_DIRTY_CLOSE) if (q->type == Q_DIRTY_CLOSE)
{ {
while (con->mysql.net.vio) if (con->mysql.net.vio)
{ {
vio_delete(con->mysql.net.vio); vio_delete(con->mysql.net.vio);
con->mysql.net.vio = 0; 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) else if (flags & QUERY_REAP)
{ {
pthread_mutex_lock(&cn->mutex); pthread_mutex_lock(&cn->mutex);
if (!cn->query_done) while (!cn->query_done)
pthread_cond_wait(&cn->cond, &cn->mutex); pthread_cond_wait(&cn->cond, &cn->mutex);
pthread_mutex_unlock(&cn->mutex); pthread_mutex_unlock(&cn->mutex);
} }