diff options
| author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-07-14 22:23:36 +0700 |
|---|---|---|
| committer | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2021-07-14 22:25:44 +0700 |
| commit | ff0d3bb8ddbc34f4f2acf02110147181d1c10960 (patch) | |
| tree | 9516f023827d9e241258456deb1e294171b057fb | |
| parent | 04369f9cee4e2ce7562d42344cd59683b5fbb8ae (diff) | |
| download | mariadb-git-ff0d3bb8ddbc34f4f2acf02110147181d1c10960.tar.gz | |
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.
| -rw-r--r-- | client/mysqltest.cc | 2 | ||||
| -rw-r--r-- | mysql-test/main/limit_rows_examined.test | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index c4b6aad6346..5008a048148 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -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 */ diff --git a/mysql-test/main/limit_rows_examined.test b/mysql-test/main/limit_rows_examined.test index 8dc595ab594..2315580410f 100644 --- a/mysql-test/main/limit_rows_examined.test +++ b/mysql-test/main/limit_rows_examined.test @@ -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.*"); |