Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
This commit is contained in:
msvensson@pilot.blaudden 2007-02-28 10:06:21 +01:00
commit 548112ce36

View file

@ -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);