Commit ff0d3bb8 authored by Dmitry Shulga's avatar Dmitry Shulga

MDEV-26146: The test main.limit_rows_examined fails in case it is run in PS mode.

Test failed by firing assert in append_warnings() when it is called
from run_query_stmt() and there are more results from server.

Obviously, append_warnings() should be called after the last packet
received from server. So, to fix the assertion failure the function
mysql_more_results() has to be called to check that now more results
does exist and invokes append_warnings() in case the condition satisfied.
parent 04369f9c
......@@ -8416,7 +8416,7 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
append_session_track_info(ds, mysql);
if (!disable_warnings)
if (!disable_warnings && !mysql_more_results(stmt->mysql))
{
/* Get the warnings from execute */
......
......@@ -2,11 +2,6 @@
# Tests for LIMIT ROWS EXAMINED, MDEV-28
#
if (`SELECT $PS_PROTOCOL != 0`)
{
--skip Test temporarily disabled for ps-protocol
}
--source include/default_optimizer_switch.inc
call mtr.add_suppression("Sort aborted.*");
......
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