summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-02-28 10:06:21 +0100
committerunknown <msvensson@pilot.blaudden>2007-02-28 10:06:21 +0100
commit64278d4fc9020d9715867b7b2ef43aa67478b128 (patch)
tree3ef763ae9d8aa28ded58f9bb7da066b2aeb12fac /client/mysqltest.c
parent8c5a862569a75c175882544fff1de45be07e076b (diff)
parentd59d5f18c43e3165a1cdb56870702e7202a0a2b0 (diff)
downloadmariadb-git-64278d4fc9020d9715867b7b2ef43aa67478b128.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 0300afd980c..9141f9c518e 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -5337,8 +5337,9 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
/*
If we got here the statement succeeded and was expected to do so,
get data. Note that this can still give errors found during execution!
+ Store the result of the query if if will return any fields
*/
- if (mysql_stmt_store_result(stmt))
+ if (mysql_stmt_field_count(stmt) && mysql_stmt_store_result(stmt))
{
handle_error(command, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds);