Merge remote-tracking branch 10.4 into 10.5

mysql-test/main/innodb_ext_key.result

@@ -813,7 +813,7 @@ PRIMARY KEY(pk)
 INSERT INTO t2 SELECT a,a FROM t1;
 EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	index	NULL	k1	23	NULL	10	Using index
+1	SIMPLE	t2	index	NULL	k1	23	NULL	#	Using index
 DROP TABLE t1,t2;
 set global innodb_stats_persistent= @innodb_stats_persistent_save;
 set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save;

mysql-test/main/innodb_ext_key.test

@@ -640,6 +640,7 @@ CREATE TABLE t2 (
 )ENGINE=INNODB;
 
 INSERT INTO t2 SELECT a,a FROM t1;
+--replace_column 9 #
 EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1);
 
 DROP TABLE t1,t2;