Commit 64278d4f authored by unknown's avatar unknown
Browse files

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

client/mysqltest.c

+2 −1
Original line number Diff line number Diff line
@@ -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);