Adjusted test results after rebase of MDEV-7487 related commits against 11.1

2 files changed, 19 insertions, 19 deletions

diff --git a/mysql-test/main/delete_use_source_engines.result b/mysql-test/main/delete_use_source_engines.result
index fd0d3b8dbe0..b1ad9c009d9 100644
--- a/mysql-test/main/delete_use_source_engines.result
+++ b/mysql-test/main/delete_use_source_engines.result
@@ -91,7 +91,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.00	100.00	5.56	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.00	3.12	5.56	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -183,7 +183,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 in (select a.c2 from t1 a where a.c2 = t1.c3) limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	100.00	12.50	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	24.50	100.00	1.02	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	24.50	3.12	1.02	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	2	2
@@ -647,7 +647,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	t1_c2	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	index	NULL	t1_c2	10	NULL	32	11.67	100.00	5.71	Using where; Using index; FirstMatch(t1)
+1	PRIMARY	a	index	NULL	t1_c2	10	NULL	32	11.67	3.12	5.71	Using where; Using index; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -783,8 +783,8 @@ order by c3 desc limit 1;
 explain select * from t1 where c1 in (select a.c2 from t1 a where a.c3 = t1.c3)
 order by c3 desc limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using where; Using filesort
-1	PRIMARY	a	ref	t1_c2	t1_c2	5	test.t1.c1	5	Using where; FirstMatch(t1)
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using temporary; Using filesort
+1	PRIMARY	a	ALL	t1_c2	NULL	NULL	NULL	32	Using where; FirstMatch(t1); Using join buffer (flat, BNL join)
 explain delete from t1 where c1 in (select a.c2 from t1 a where a.c3 = t1.c3)
 order by c3 desc limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -1204,7 +1204,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.33	100.00	5.41	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.33	3.12	5.41	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -1854,7 +1854,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.67	100.00	5.26	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.67	3.12	5.26	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -1946,7 +1946,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 in (select a.c2 from t1 a where a.c2 = t1.c3) limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	25.00	100.00	12.00	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	22.67	100.00	1.47	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	22.67	3.12	1.47	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	2	2
@@ -2625,7 +2625,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	t1_c2	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	index	NULL	t1_c2	10	NULL	32	11.67	100.00	5.71	Using where; Using index; FirstMatch(t1)
+1	PRIMARY	a	index	NULL	t1_c2	10	NULL	32	11.67	3.12	5.71	Using where; Using index; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -3394,7 +3394,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.00	100.00	5.56	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.00	3.12	5.56	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -4259,7 +4259,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.67	100.00	5.26	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	12.67	3.12	5.26	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -4351,7 +4351,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 in (select a.c2 from t1 a where a.c2 = t1.c3) limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	25.00	100.00	12.00	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	22.67	100.00	1.47	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	22.67	3.12	1.47	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	2	2
@@ -5030,7 +5030,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	t1_c2	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	index	NULL	t1_c2	10	NULL	32	11.67	100.00	5.71	Using where; Using index; FirstMatch(t1)
+1	PRIMARY	a	index	NULL	t1_c2	10	NULL	32	11.67	3.12	5.71	Using where; Using index; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
@@ -5166,8 +5166,8 @@ order by c3 desc limit 1;
 explain select * from t1 where c1 in (select a.c2 from t1 a where a.c3 = t1.c3)
 order by c3 desc limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using where; Using filesort
-1	PRIMARY	a	ref	t1_c2	t1_c2	5	test.t1.c1	5	Using where; FirstMatch(t1)
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	Using temporary; Using filesort
+1	PRIMARY	a	ALL	t1_c2	NULL	NULL	NULL	32	Using where; FirstMatch(t1); Using join buffer (flat, BNL join)
 explain delete from t1 where c1 in (select a.c2 from t1 a where a.c3 = t1.c3)
 order by c3 desc limit 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -5799,7 +5799,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 analyze delete from t1 where c1 = 1 and exists (select 'X' from t1 a where a.c1 = t1.c2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	32	32.00	9.38	9.38	Using where
-1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	13.33	100.00	5.00	Using where; FirstMatch(t1)
+1	PRIMARY	a	ALL	NULL	NULL	NULL	NULL	32	13.33	3.12	5.00	Using where; FirstMatch(t1)
 select * from t1;
 c1	c2	c3
 1	3	3
diff --git a/mysql-test/main/myisam_explain_non_select_all.result b/mysql-test/main/myisam_explain_non_select_all.result
index 8b2979b5154..28107af3770 100644
--- a/mysql-test/main/myisam_explain_non_select_all.result
+++ b/mysql-test/main/myisam_explain_non_select_all.result
@@ -270,7 +270,7 @@ FLUSH TABLES;
 EXPLAIN EXTENDED UPDATE        t1 SET a = 10 WHERE a IN (SELECT b FROM t2 WHERE t1.a < 3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where; FirstMatch(t1)
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	33.33	Using where; FirstMatch(t1)
 Warnings:
 Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
 # Status of EXPLAIN EXTENDED query
@@ -908,7 +908,7 @@ FLUSH TABLES;
 EXPLAIN EXTENDED UPDATE t1 SET a = 10 WHERE a IN (SELECT a FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where; FirstMatch(t1)
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	4	25.00	Using where; FirstMatch(t1)
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 Handler_read_key	4
@@ -994,7 +994,7 @@ FLUSH TABLES;
 EXPLAIN EXTENDED DELETE   FROM t1 WHERE a1 IN (SELECT a2 FROM t2 WHERE a2 > 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	5	100.00	
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where; FirstMatch(t1)
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	5	20.00	Using where; FirstMatch(t1)
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 Handler_read_key	4