Commit 95362e0d authored by Dmitry Shulga's avatar Dmitry Shulga

Fix mysql_client_test failure introduced by a patch for Bug#47485.

The problem was that mysql_stmt_next_result() (new to 5.5)
was not properly updated.

libmysql/libmysql.c:
  mysql_stmt_next_result() modified: set mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT before return
  if there is a result set.
parent 32065d22
...@@ -4874,6 +4874,9 @@ int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt) ...@@ -4874,6 +4874,9 @@ int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt)
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }
if (mysql->status == MYSQL_STATUS_GET_RESULT)
mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
stmt->state= MYSQL_STMT_EXECUTE_DONE; stmt->state= MYSQL_STMT_EXECUTE_DONE;
stmt->bind_result_done= FALSE; stmt->bind_result_done= FALSE;
......
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