diff options
author | unknown <monty@hundin.mysql.fi> | 2002-06-02 17:04:16 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 17:04:16 +0300 |
commit | 499ebe5459e655ede75f0d9c30608dd704e637a9 (patch) | |
tree | 94ea4566e60e0653e37c415afee1899dc3bac9d9 /client | |
parent | d5adf39c85eb1a4acdf828ad4ea675beb30d4c81 (diff) | |
download | mariadb-git-499ebe5459e655ede75f0d9c30608dd704e637a9.tar.gz |
Fixed bug in wait_for_relay_log_space()
Added checking of sem_init() in configure.
client/mysqltest.c:
Cleanup
configure.in:
Added checking of sem_init
sql/hostname.cc:
Portability fix
sql/slave.cc:
Fixed bug in wait_for_relay_log_space()
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 27763736f96..1a4e61027fe 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2410,9 +2410,11 @@ int main(int argc, char** argv) case Q_QUERY: case Q_REAP: { - int flags = QUERY_REAP; /* we read the result always regardless - * of the mode for both full query and - * read-result only ( reap) */ + /* + We read the result always regardless of the mode for both full + query and read-result only (reap) + */ + int flags = QUERY_REAP; if (q->type != Q_REAP) /* for a full query, enable the send stage */ flags |= QUERY_SEND; if (q_send_flag) @@ -2439,12 +2441,13 @@ int main(int argc, char** argv) /* fix up query pointer if this is * first iteration for this line */ if (q->query == q->query_buf) q->query += q->first_word_len; - error |= run_query(&cur_con->mysql, q, QUERY_SEND); - /* run query can execute a query partially, depending on the flags - * QUERY_SEND flag without QUERY_REAP tells it to just send the - * query and read the result some time later when reap instruction - * is given on this connection + /* + run_query() can execute a query partially, depending on the flags + QUERY_SEND flag without QUERY_REAP tells it to just send the + query and read the result some time later when reap instruction + is given on this connection. */ + error |= run_query(&cur_con->mysql, q, QUERY_SEND); break; case Q_RESULT: get_file_name(save_file,q); |