diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
| commit | d11829654c4ef5c3d0f997ca61a50d4bd196db8a (patch) | |
| tree | e48a5775e961b17600bf9c1c189243deb5515ba7 /client/mysqltest.cc | |
| parent | e022b6ef07529d83e8c1cbd5e3d374fc5cc75721 (diff) | |
| parent | 704898bf3200af4da42c1bf9251a7da5533db73f (diff) | |
| download | mariadb-git-d11829654c4ef5c3d0f997ca61a50d4bd196db8a.tar.gz | |
merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f204f359656..bb89db4b231 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2009-2012 Monty Program Ab. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2009, 2012, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -5148,7 +5148,7 @@ typedef struct static st_error global_error_names[] = { - { "<No error>", -1, "" }, + { "<No error>", -1U, "" }, #include <mysqld_ername.h> { 0, 0, 0 } }; @@ -7710,6 +7710,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; |