summaryrefslogtreecommitdiff
path: root/mysql-test/r/join_outer.result
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2005-03-13 00:40:55 -0800
committerigor@rurik.mysql.com <>2005-03-13 00:40:55 -0800
commit7d8b91060dd46e8f13fe39ceda6ba7e0f235bd46 (patch)
treed9fa5f498430ba3a3a6ff53d7d3c29a5241dbe65 /mysql-test/r/join_outer.result
parentf463143158457006a13b1247b148ba64d788bb93 (diff)
parenta90d2bd97c9893b2a3df6f8aeeb315d589f4660c (diff)
downloadmariadb-git-7d8b91060dd46e8f13fe39ceda6ba7e0f235bd46.tar.gz
Manual merge
Diffstat (limited to 'mysql-test/r/join_outer.result')
-rw-r--r--mysql-test/r/join_outer.result22
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index 01447d5e464..316483d0a5e 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -889,3 +889,25 @@ a b a b
2 2 2 2
NULL NULL 3 3
DROP TABLE t0,t1,t2,t3;
+CREATE TABLE t1 (a int PRIMARY KEY, b int);
+CREATE TABLE t2 (a int PRIMARY KEY, b int);
+INSERT INTO t1 VALUES (1,1), (2,1), (3,1), (4,2);
+INSERT INTO t2 VALUES (1,2), (2,2);
+SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a;
+a b a b
+1 1 1 2
+2 1 2 2
+3 1 NULL NULL
+4 2 NULL NULL
+SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE t1.b=1;
+a b a b
+1 1 1 2
+2 1 2 2
+3 1 NULL NULL
+SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
+WHERE t1.b=1 XOR (NOT ISNULL(t2.a) AND t2.b=1);
+a b a b
+1 1 1 2
+2 1 2 2
+3 1 NULL NULL
+DROP TABLE t1,t2;