diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2020-11-10 12:29:20 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2020-11-10 12:29:20 +0300 |
| commit | dba846ce2a4c57363c4f0256b0e6d2dd1a55ac40 (patch) | |
| tree | 957c12ba594f6c9d328e6688d0ba64aa2787632f | |
| parent | 212d92ad26e14d0293bb50efd7b7461c621a24b9 (diff) | |
| download | mariadb-git-dba846ce2a4c57363c4f0256b0e6d2dd1a55ac40.tar.gz | |
MDEV-24117: Memory management problem (in range optimizer)mariadb-10.3.27
Adjust the testcase for MariaDB 10.3+ : prevent IN-to-subquery conversion
optimization from working.
| -rw-r--r-- | mysql-test/main/range.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/range.test | 2 | ||||
| -rw-r--r-- | mysql-test/main/range_mrr_icp.result | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/range.result b/mysql-test/main/range.result index 26f871e7c96..a54b76c0b3f 100644 --- a/mysql-test/main/range.result +++ b/mysql-test/main/range.result @@ -3056,7 +3056,7 @@ set @tmp_24117= @@max_session_mem_used; # - 2.8M without the bug # - 1G with the bug. set max_session_mem_used=64*1024*1024; -set @query=concat('explain select * from t2 where a in (', @query, ')'); +set @query=concat('explain select * from t2 where a=1 or a in (', @query, ')'); prepare s from @query; # This should not fail with an error: execute s; diff --git a/mysql-test/main/range.test b/mysql-test/main/range.test index f03c21ad9c1..c850498d7f2 100644 --- a/mysql-test/main/range.test +++ b/mysql-test/main/range.test @@ -2102,7 +2102,7 @@ set @tmp_24117= @@max_session_mem_used; set max_session_mem_used=64*1024*1024; -set @query=concat('explain select * from t2 where a in (', @query, ')'); +set @query=concat('explain select * from t2 where a=1 or a in (', @query, ')'); prepare s from @query; diff --git a/mysql-test/main/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result index 25cafc4b5a7..98e95e75d37 100644 --- a/mysql-test/main/range_mrr_icp.result +++ b/mysql-test/main/range_mrr_icp.result @@ -3068,7 +3068,7 @@ set @tmp_24117= @@max_session_mem_used; # - 2.8M without the bug # - 1G with the bug. set max_session_mem_used=64*1024*1024; -set @query=concat('explain select * from t2 where a in (', @query, ')'); +set @query=concat('explain select * from t2 where a=1 or a in (', @query, ')'); prepare s from @query; # This should not fail with an error: execute s; |