diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-06-29 16:54:55 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-06-29 16:54:55 +0300 |
| commit | e65c291807f57b9533df07963b0385cbfdd5b474 (patch) | |
| tree | e47e30d41c92efb2ee66c520957eae4bdf7b8513 /client | |
| parent | 66ef5b0d48006263e2ae8eec29fd8900d6708af4 (diff) | |
| parent | 107c894a540d147338ab4e737eb9ef76e49c3493 (diff) | |
| download | mariadb-git-e65c291807f57b9533df07963b0385cbfdd5b474.tar.gz | |
merge bug#13708485 5.1->5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 6bd1472f6a3..b1784fdc7b6 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7303,6 +7303,8 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, */ if ((counter==0) && do_read_query_result(cn)) { + /* we've failed to collect the result set */ + cn->pending= TRUE; handle_error(command, mysql_errno(mysql), mysql_error(mysql), mysql_sqlstate(mysql), ds); goto end; |