revision-id: 304a2a6ca6a906afaf60c2650b21c2de7a06df60 (mariadb-10.6.1-372-g304a2a6ca6a) parent(s): 7ba842d1e8d81ca99887e500187ec6dc6964c858 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2022-03-22 07:56:44 +0300 message: Update test results (7) --- mysql-test/include/mrr_tests.inc | 1 + mysql-test/main/myisam_mrr.result | 2 +- mysql-test/main/xtradb_mrr.result | 2 +- mysql-test/suite/innodb/r/innodb_mysql.result | 2 +- mysql-test/suite/innodb/t/innodb_mysql.test | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/mrr_tests.inc b/mysql-test/include/mrr_tests.inc index ad7dff61477..a50cc8c16f0 100644 --- a/mysql-test/include/mrr_tests.inc +++ b/mysql-test/include/mrr_tests.inc @@ -89,6 +89,7 @@ insert into t4 (a,b,c,filler) insert into t4 (a,b,c,filler) select 'zz-1',NULL,'cc-2', 'filler-data' from t2 order by a limit 500; +--replace_column 11 FLTRD explain select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' or c='no-such-row2'); diff --git a/mysql-test/main/myisam_mrr.result b/mysql-test/main/myisam_mrr.result index 57e6a443940..37ad7565a1b 100644 --- a/mysql-test/main/myisam_mrr.result +++ b/mysql-test/main/myisam_mrr.result @@ -189,7 +189,7 @@ explain select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' or c='no-such-row2'); id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t4 NULL range idx1 idx1 29 NULL 10 1.79 Using index condition; Rowid-ordered scan +1 SIMPLE t4 NULL range idx1 idx1 29 NULL 10 FLTRD Using index condition; Rowid-ordered scan select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' or c='no-such-row2'); a b c filler diff --git a/mysql-test/main/xtradb_mrr.result b/mysql-test/main/xtradb_mrr.result index ceb98f2c7d5..015d1e61753 100644 --- a/mysql-test/main/xtradb_mrr.result +++ b/mysql-test/main/xtradb_mrr.result @@ -186,7 +186,7 @@ explain select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' or c='no-such-row2'); id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t4 NULL range idx1 idx1 29 NULL 16 2.86 Using index condition; Rowid-ordered scan +1 SIMPLE t4 NULL range idx1 idx1 29 NULL 16 FLTRD Using index condition; Rowid-ordered scan select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' or c='no-such-row2'); a b c filler diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 7a2dfa7eec8..0bdf7965b0e 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -3373,7 +3373,7 @@ SELECT v2 FROM t1 WHERE v1 IN ('f', 'd', 'h', 'u' ) AND i = 2; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 NULL ref i,v i 5 const 2 100.00 Using where +1 SIMPLE t1 NULL ref i,v i 5 const 2 FLTRD Using where DROP TABLE t1; # # Bug#54606 innodb fast alter table + pack_keys=0 diff --git a/mysql-test/suite/innodb/t/innodb_mysql.test b/mysql-test/suite/innodb/t/innodb_mysql.test index d495186db25..ae681fc8631 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql.test +++ b/mysql-test/suite/innodb/t/innodb_mysql.test @@ -1015,6 +1015,7 @@ WHERE v1 IN ('f', 'd', 'h', 'u' ) AND i = 2; --echo --echo # Should not use index_merge +--replace_column 11 FLTRD EXPLAIN SELECT v2 FROM t1