main.innodb_icp fails in buildbot with various wrong execution plans

main.innodb_icp 'innodb'                 w3 [ fail ]

        Test ended at 2019-07-22 18:31:40

CURRENT_TEST: main.innodb_icp

--- /usr/local/mariadb-10.4.7-linux-i686/mysql-test/main/innodb_icp.result	2019-07-22 16:40:50.000000000 +0300

+++ /usr/local/mariadb-10.4.7-linux-i686/mysql-test/main/innodb_icp.reject	2019-07-22 18:31:40.171876075 +0300

@@ -172,7 +172,7 @@

 ORDER BY ts DESC

 LIMIT 2;

 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

-1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using where

+1	SIMPLE	t1	index	PRIMARY	PRIMARY	4	NULL	2	Using where

 DROP TABLE t1;

 #

mysqltest: Result content mismatch

main.innodb_icp 'innodb'                 w3 [ fail ]

        Test ended at 2019-07-17 12:21:49

CURRENT_TEST: main.innodb_icp

Warning: /mnt/buildbot/build/mariadb-10.4.7/libmysqld/examples/mysqltest_embedded: unknown variable 'loose-ssl-ca=/mnt/buildbot/build/mariadb-10.4.7/mysql-test/std_data/cacert.pem'

Warning: /mnt/buildbot/build/mariadb-10.4.7/libmysqld/examples/mysqltest_embedded: unknown variable 'loose-ssl-cert=/mnt/buildbot/build/mariadb-10.4.7/mysql-test/std_data/client-cert.pem'

Warning: /mnt/buildbot/build/mariadb-10.4.7/libmysqld/examples/mysqltest_embedded: unknown variable 'loose-ssl-key=/mnt/buildbot/build/mariadb-10.4.7/mysql-test/std_data/client-key.pem'

Warning: /mnt/buildbot/build/mariadb-10.4.7/libmysqld/examples/mysqltest_embedded: unknown option '--loose-skip-ssl'

--- /mnt/buildbot/build/mariadb-10.4.7/mysql-test/main/innodb_icp.result	2019-07-17 07:03:53.000000000 -0400

+++ /mnt/buildbot/build/mariadb-10.4.7/mysql-test/main/innodb_icp.reject	2019-07-17 12:21:48.789562771 -0400

@@ -437,7 +437,7 @@

 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	Using where

 2	DEPENDENT SUBQUERY	it	eq_ref	PRIMARY	PRIMARY	4	func	1	Using where

-2	DEPENDENT SUBQUERY	t2	index	NULL	PRIMARY	4	NULL	3	Using index; Using join buffer (flat, BNL join)

+2	DEPENDENT SUBQUERY	t2	index	NULL	PRIMARY	4	NULL	4	Using index; Using join buffer (flat, BNL join)

 SELECT * FROM t1

 WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);

 pk	i

mysqltest: Result content mismatch