Commit 82eed8b2 authored by unknown's avatar unknown
Browse files

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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

parents 8b373971 a6a71833
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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);