diff options
| author | unknown <serg@serg.mylan> | 2005-03-14 14:47:51 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-14 14:47:51 +0100 |
| commit | ebbee9d974a37ce9fad0a2b67152cbc412a58067 (patch) | |
| tree | f9212bc6a4dc14f47bfce79ca07320ec3d810728 /mysql-test/r/join_outer.result | |
| parent | 1c234737515106342180daa9671de15dedd48fcc (diff) | |
| parent | 87b40f2013a108ed3caaf6912772354d0b0dc842 (diff) | |
| download | mariadb-git-ebbee9d974a37ce9fad0a2b67152cbc412a58067.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/join_outer.result')
| -rw-r--r-- | mysql-test/r/join_outer.result | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 15131b90a7a..ddd05bbd2bc 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -896,3 +896,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; |