Commit 64278d4f authored by unknown's avatar unknown

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
parents 8c5a8625 d59d5f18
...@@ -5337,8 +5337,9 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, ...@@ -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, 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! 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), handle_error(command, mysql_stmt_errno(stmt),
mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds); 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