summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorjani@ua167d18.elisa.omakaista.fi <>2003-11-20 20:06:51 +0200
committerjani@ua167d18.elisa.omakaista.fi <>2003-11-20 20:06:51 +0200
commit0b1bae4677704ce2f34ea813aef3f56aa862a9e2 (patch)
tree30db4dd03bdc4e6bc10d1b3688ff49869f216828 /client
parentda73d77f6fa58c434ddaf9c0908422c57f6c43a6 (diff)
downloadmariadb-git-0b1bae4677704ce2f34ea813aef3f56aa862a9e2.tar.gz
Added error reporting if one of the multi queries failed.
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index f1921fbbe82..059a1ad36f5 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1621,7 +1621,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
char buff[200], time_buff[32], *pos;
MYSQL_RES *result;
ulong timer, warnings;
- uint error=0;
+ uint error= 0;
+ int err= 0;
if (!status.batch)
{
@@ -1739,7 +1740,9 @@ com_go(String *buffer,char *line __attribute__((unused)))
else if (unbuffered)
fflush(stdout);
mysql_free_result(result);
- } while (!mysql_next_result(&mysql));
+ } while (!(err= mysql_next_result(&mysql)));
+ if (err >= 1)
+ error= put_error(&mysql);
return error; /* New command follows */
}