MDEV-16708: Fixed the failed test main.join_cache

MariaDB · Jun 17, 2021 · b33111b · b33111b
1 parent 129098b
commit b33111b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result
@@ -5993,14 +5993,14 @@ create table t3 (c3 int);
 insert into t1 values (1), (2);
 insert into t2 values (1), (2);
 insert into t3 values (2);
+set @counter=0;
 explain
 select count(*) from t1 straight_join t2
 where c1 = c2-0 and c2 <= (select max(c3) from t3 where c3 = 2 and @counter:=@counter+1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer (flat, BNL join)
-2	UNCACHEABLE SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
-set @counter=0;
+2	UNCACHEABLE SUBQUERY	t3	system	NULL	NULL	NULL	NULL	1	
 select count(*) from t1 straight_join t2
 where c1 = c2-0 and c2 <= (select max(c3) from t3 where c3 = 2 and @counter:=@counter+1);
 count(*)

diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test
@@ -3998,12 +3998,12 @@ insert into t1 values (1), (2);
 insert into t2 values (1), (2);
 insert into t3 values (2);
 
+set @counter=0;
+
 explain
 select count(*) from t1 straight_join t2
 where c1 = c2-0 and c2 <= (select max(c3) from t3 where c3 = 2 and @counter:=@counter+1);
 
-set @counter=0;
-
 select count(*) from t1 straight_join t2
 where c1 = c2-0 and c2 <= (select max(c3) from t3 where c3 = 2 and @counter:=@counter+1);