revision-id: 57145997436a8c4f509a40b351fccf8806c13c5f (mariadb-10.6.5-85-g5714599) parent(s): 9853e407e8e5aa512b7cd3913ac01417f0bfb41c author: Igor Babaev committer: Igor Babaev timestamp: 2022-02-02 14:31:21 -0800 message: Stabilizing the test case for MDEV-22846. --- mysql-test/main/rowid_filter_innodb.result | 3 +++ mysql-test/main/rowid_filter_innodb.test | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index eab6d12..49e74d1 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -2974,6 +2974,8 @@ set global innodb_stats_persistent= @stats.save; # # MDEV-22846: ref access with full scan on keys with NULLs + rowid_filter # +set @stats.save= @@innodb_stats_persistent; +set global innodb_stats_persistent=0; CREATE TABLE t1 (pk int NOT NULL, c1 varchar(1)) engine=innodb; INSERT INTO t1 VALUES (1,NULL),(15,'o'),(16,'x'),(19,'t'),(35,'k'),(36,'h'),(42,'t'),(43,'h'), @@ -3012,4 +3014,5 @@ Warnings: Note 1276 Field or reference 'test.t1.pk' of SELECT #2 was resolved in SELECT #1 Note 1003 /* select#1 */ select `test`.`t1`.`pk` AS `pk`,`test`.`t1`.`c1` AS `c1` from `test`.`t1` where !<expr_cache><`test`.`t1`.`c1`,`test`.`t1`.`pk`>(<in_optimizer>(`test`.`t1`.`c1`,<exists>(/* select#2 */ select `test`.`t2`.`c1` from `test`.`t2` join `test`.`t1` `a1` where `test`.`t2`.`i1` = `test`.`t1`.`pk` and `test`.`t2`.`i1` is not null and trigcond(<cache>(`test`.`t1`.`c1`) = `test`.`t2`.`c1`)))) DROP TABLE t1,t2; +set global innodb_stats_persistent= @stats.save; # End of 10.4 tests diff --git a/mysql-test/main/rowid_filter_innodb.test b/mysql-test/main/rowid_filter_innodb.test index c878eb8..97b9aa0 100644 --- a/mysql-test/main/rowid_filter_innodb.test +++ b/mysql-test/main/rowid_filter_innodb.test @@ -545,6 +545,8 @@ set global innodb_stats_persistent= @stats.save; --echo # MDEV-22846: ref access with full scan on keys with NULLs + rowid_filter --echo # +set @stats.save= @@innodb_stats_persistent; +set global innodb_stats_persistent=0; CREATE TABLE t1 (pk int NOT NULL, c1 varchar(1)) engine=innodb; INSERT INTO t1 VALUES @@ -569,4 +571,6 @@ eval EXPLAIN EXTENDED $q; DROP TABLE t1,t2; +set global innodb_stats_persistent= @stats.save; + --echo # End of 10.4 tests