diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-19 13:12:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-19 13:12:38 -0400 |
| commit | a76a6601ecb63d452c89202d8ca7f11bf2e0194f (patch) | |
| tree | 80cefcea92a47dff8c41220411ea237022a82d4c /client | |
| parent | 0f5522c44f9ebb002f203ad1f983b77e3925581c (diff) | |
| parent | 0c64cd83eb392a0d2085eb6340623273a3402d4d (diff) | |
| download | mariadb-git-a76a6601ecb63d452c89202d8ca7f11bf2e0194f.tar.gz | |
bzr merge -rtag:mariadb-10.0.12 maria/10.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index efece866ef5..ef339d17a42 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -949,9 +949,13 @@ static int do_read_query_result(struct st_connection *cn) { DBUG_ASSERT(cn->has_thread); wait_query_thread_done(cn); + if (cn->result) + goto exit_func; + signal_connection_thd(cn, EMB_READ_QUERY_RESULT); wait_query_thread_done(cn); +exit_func: return cn->result; } |