summaryrefslogtreecommitdiff
path: root/mysql-test/main/join.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-29 11:39:34 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-29 11:39:34 +0200
commit51c89849d16f3f6cfadfa645c49815db3cbfece7 (patch)
tree8679103f7897480cc9b5ff3308687cce1f32dade /mysql-test/main/join.result
parentbf8735eb16068c0d2480948b365f7e39dc011be5 (diff)
parentd4cb1776030b643895da0532b75c051f55e84356 (diff)
downloadmariadb-git-51c89849d16f3f6cfadfa645c49815db3cbfece7.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/join.result')
-rw-r--r--mysql-test/main/join.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/join.result b/mysql-test/main/join.result
index c78cb8b45c7..11b7ecad3ee 100644
--- a/mysql-test/main/join.result
+++ b/mysql-test/main/join.result
@@ -3315,6 +3315,9 @@ SELECT STRAIGHT_JOIN * FROM t1, t2 AS t2_1, t2 AS t2_2
WHERE t2_2.c = t2_1.c AND t2_2.b = t2_1.b AND ( a IS NULL OR t2_1.c = a );
a b c b c
DROP TABLE t1,t2;
+select a.a from (select 1 as a) a, (select 2 as b) b cross join (select 3 as c) c left join (select 4 as d) d on 1;
+a
+1
#
# MDEV-19600: The optimizer should be able to produce rows=1 estimate for unique index with NULLable columns
#
@@ -3403,3 +3406,4 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t3 ref a a 5 test.t2.key2 1
drop table t1,t2,t3;
drop table t1000,t10,t03;
+# End of 10.3 tests