Post fix after the patch for MDEV-20576.

Adjusted test results.

5 files changed, 17 insertions, 17 deletions

diff --git a/mysql-test/r/selectivity_innodb.result b/mysql-test/r/selectivity_innodb.result
index 56a79001b13..719156a77de 100644
--- a/mysql-test/r/selectivity_innodb.result
+++ b/mysql-test/r/selectivity_innodb.result
@@ -1726,7 +1726,7 @@ b INT NOT NULL,
 c char(100),
 KEY (b, c),
 KEY (b, a, c)
-)
+) ENGINE=MyISAM
 DEFAULT CHARSET = utf8;
 INSERT INTO t1 VALUES
 (1,  1, 1),
@@ -1749,18 +1749,18 @@ INSERT INTO t1 SELECT a + 1280, b, c FROM t1 LIMIT 80;
 EXPLAIN
 SELECT a FROM t1 WHERE b = 1 ORDER BY c DESC LIMIT 9;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	b,b_2	b_2	4	const	207	Using where; Using index; Using filesort
+1	SIMPLE	t1	range	b,b_2	b	4	NULL	226	Using where
 SELECT a FROM t1 WHERE b = 1 ORDER BY c DESC LIMIT 9;
 a
 2071
-81
-71
-61
-51
-41
-31
-21
-11
+2061
+2051
+2041
+2031
+2021
+2011
+2001
+1991
 set optimizer_use_condition_selectivity=@save_optimizer_use_condition_selectivity;
 DROP TABLE t1;
 # End of 10.1 tests
diff --git a/mysql-test/t/selectivity.test b/mysql-test/t/selectivity.test
index 6e93e60fff6..0deacc390db 100644
--- a/mysql-test/t/selectivity.test
+++ b/mysql-test/t/selectivity.test
@@ -1174,7 +1174,7 @@ CREATE TABLE t1 (
   c char(100),
   KEY (b, c),
   KEY (b, a, c)
-)
+) ENGINE=MyISAM
 DEFAULT CHARSET = utf8;
 
 INSERT INTO t1 VALUES
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-29.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-29.result
index 5c02babaed3..b532eabb301 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-29.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-29.result
@@ -26,7 +26,7 @@ delete from foo where a > 5;
 # number of rows should be 9
 explain select * from foo where a > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	9	Using where
+1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	5	Using where
 # should have just 4 values
 select * from foo where a > 1;
 a	b
@@ -37,7 +37,7 @@ a	b
 # number of rows should be 9
 explain select * from foo where a > 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	9	Using where
+1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	5	Using where
 # 9 values
 select * From foo where a > 1;
 a	b
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-30.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-30.result
index c57787f2a8d..f293fe94ab2 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-30.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-30.result
@@ -26,7 +26,7 @@ delete from foo where a < 10;
 # number of rows should be 9
 explain select * from foo where a < 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	9	Using where
+1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	5	Using where
 # should have just 4 values
 select * from foo where a < 50;
 a	b
@@ -37,7 +37,7 @@ a	b
 # number of rows should be 9
 explain select * from foo where a < 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	9	Using where
+1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	5	Using where
 # 9 values
 select * From foo where a < 50;
 a	b
diff --git a/storage/tokudb/mysql-test/tokudb/r/mvcc-31.result b/storage/tokudb/mysql-test/tokudb/r/mvcc-31.result
index ebc5ae49535..cb55f679061 100644
--- a/storage/tokudb/mysql-test/tokudb/r/mvcc-31.result
+++ b/storage/tokudb/mysql-test/tokudb/r/mvcc-31.result
@@ -26,7 +26,7 @@ delete from foo where a = 2 or a = 4 or a = 10 or a = 30 or a = 50;
 # number of rows should be 8
 explain select * from foo where a > 1 and a < 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	8	Using where
+1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	5	Using where
 # should have just 4 values
 select * from foo where a > 1 and a < 50;
 a	b
@@ -37,7 +37,7 @@ a	b
 # number of rows should be 8
 explain select * from foo where a > 1 and a < 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	8	Using where
+1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	5	Using where
 # 8 values
 select * from foo where a > 1 and a < 50;
 a	b