diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 528ee68fb9c..1619f69b4b9 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -560,7 +560,7 @@ The following specify which files/extra groups are read (specified before remain
  exceeds this value.  If 0 at startup, it's set to
  max_binlog_size
  --max-rowid-filter-size=# 
- The maximum number of rows that fit in memory
+ The maximum size of the container of a rowid filter
  --max-seeks-for-key=# 
  Limit assumed max number of seeks when looking up rows
  based on a key
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index f1573d46a6f..7a164da41b5 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -385,7 +385,7 @@ INSERT INTO t1(id, dept, age, name) VALUES
 (4020, 'cs10', 20, 'rs5'),(4027, 'cs11', 10, 'rs6'),(4028, 'cs12', 20, 'rs6');
 EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	name	name	44	NULL	2	Using where; Using index for group-by
+1	SIMPLE	t1	ref	name	name	22	const	2	Using where; Using index
 SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
 name	dept
 rs5	cs10
@@ -2353,12 +2353,12 @@ EXPLAIN SELECT c FROM foo2 WHERE b>2;;
 id	1
 select_type	SIMPLE
 table	foo2
-type	range
+type	index
 possible_keys	b
 key	b
 key_len	5
 ref	NULL
-rows	5
+rows	6
 Extra	Using where; Using index
 EXPLAIN SELECT c FROM bar WHERE c>2;;
 id	1
@@ -3020,7 +3020,7 @@ EXPLAIN SELECT * FROM t1 WHERE f1 IN
 3784744,4180925,4559596,3963734,3856391,4494153)
 AND f5 = 'abcdefghijklmnopwrst' AND f2 = 1221457 AND f4 = 0 ;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index_merge	PRIMARY,idx1,idx2	idx2,idx1,PRIMARY	7,60,4	NULL	1	Using intersect(idx2,idx1,PRIMARY); Using where
+1	SIMPLE	t1	range	PRIMARY,idx1,idx2	PRIMARY	4	NULL	18	Using where
 set optimizer_switch=@tmp_innodb_mysql;
 DROP TABLE t1;
 #
@@ -3053,7 +3053,7 @@ f1	f2	f3	f4
 EXPLAIN SELECT * FROM t1 WHERE f2 = 1 AND f4 = TRUE
 ORDER BY f1 DESC LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	f2,f4	f4	1	NULL	22	Using where
+1	SIMPLE	t1	index	f2,f4	PRIMARY	4	NULL	5	Using where
 DROP TABLE t1;
 #
 # Bug#54117 crash in thr_multi_unlock, temporary table
diff --git a/mysql-test/suite/innodb/r/innodb_stats_persistent.result b/mysql-test/suite/innodb/r/innodb_stats_persistent.result
index 44cb3a81372..11a352e625d 100644
--- a/mysql-test/suite/innodb/r/innodb_stats_persistent.result
+++ b/mysql-test/suite/innodb/r/innodb_stats_persistent.result
@@ -30,7 +30,7 @@ connection default;
 # DELETE must not affect statistics before COMMIT.
 EXPLAIN SELECT * FROM t1 WHERE val=4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	val	val	4	const	16	Using index
+1	SIMPLE	t1	ref	val	val	4	const	1	Using index
 connection con1;
 COUNT(*)
 0