MDEV-15253:Default optimizer setting changes for MariaDB 10.310.3-MDEV-7773

Milestone 1: raising join_cache_level to 4 from 2

1 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result
index 692806c7cac..e829853baa4 100644
--- a/mysql-test/r/func_in.result
+++ b/mysql-test/r/func_in.result
@@ -370,8 +370,8 @@ JOIN t2 ON t3.a=t2.a
 JOIN t4 WHERE t4.a IN (t1.b, t2.b);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index
-1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	
+1	SIMPLE	t1	hash_ALL	PRIMARY	#hash#PRIMARY	4	test.t3.a	6	Using join buffer (flat, BNLH join)
+1	SIMPLE	t2	hash_ALL	PRIMARY	#hash#PRIMARY	4	test.t3.a	5	Using join buffer (incremental, BNLH join)
 1	SIMPLE	t4	ALL	PRIMARY	NULL	NULL	NULL	7	Range checked for each record (index map: 0x1)
 SELECT STRAIGHT_JOIN * FROM t3 
 JOIN t1 ON t3.a=t1.a 
@@ -388,8 +388,8 @@ FROM t3, t1, t2
 WHERE t3.a=t1.a AND t3.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t3	index	PRIMARY	PRIMARY	4	NULL	4	Using index
-1	PRIMARY	t1	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	
-1	PRIMARY	t2	eq_ref	PRIMARY	PRIMARY	4	test.t3.a	1	
+1	PRIMARY	t1	hash_ALL	PRIMARY	#hash#PRIMARY	4	test.t3.a	6	Using join buffer (flat, BNLH join)
+1	PRIMARY	t2	hash_ALL	PRIMARY	#hash#PRIMARY	4	test.t3.a	5	Using join buffer (incremental, BNLH join)
 2	DEPENDENT SUBQUERY	t4	index	NULL	PRIMARY	4	NULL	7	Using where; Using index
 SELECT STRAIGHT_JOIN 
 (SELECT SUM(t4.a) FROM t4 WHERE t4.a IN (t1.b, t2.b))