Commit 7a3dbd11 authored by unknown's avatar unknown

Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my41-bug19410

into  pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410


client/mysqltest.c:
  Auto merged
parents 36e937bd c6698b32
......@@ -5356,8 +5356,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment