summaryrefslogtreecommitdiff
path: root/mysql-test/r/join_outer.result
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-08-26 21:38:04 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-08-26 21:38:04 +0400
commitedd980225a9895f46754d54677bd76327152c78b (patch)
treeb3dbba0fb4041fa209f463e5ca238d388c98b444 /mysql-test/r/join_outer.result
parentaf753c2188d9582a36a550bab0d2ee64205630c8 (diff)
downloadmariadb-git-edd980225a9895f46754d54677bd76327152c78b.tar.gz
Fix for MDEV-4836 fix: take into account situation where "notnull_col IS NULL" is not
a direct child of the WHERE clause item, but rather is embedded inside Item_cond_and or Item_cond_or.
Diffstat (limited to 'mysql-test/r/join_outer.result')
-rw-r--r--mysql-test/r/join_outer.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index 3cfe2b20a1a..d77f3df1cdf 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -2150,6 +2150,14 @@ id d i
1 0000-00-00 NULL
2 0000-00-00 NULL
DROP TABLE t1,t2;
+CREATE TABLE t1 (i1 INT, d1 DATE NOT NULL);
+INSERT INTO t1 VALUES (1,'2012-12-21'),(2,'0000-00-00');
+CREATE TABLE t2 (i2 INT, j2 INT);
+INSERT INTO t2 VALUES (1,10),(2,20);
+SELECT * FROM t1 LEFT JOIN t2 ON i1 = j2 WHERE d1 IS NULL AND 1 OR i1 = i2;
+i1 d1 i2 j2
+2 0000-00-00 NULL NULL
+DROP TABLE t1,t2;
#
# Bug mdev-4942: LEFT JOIN with conjunctive
# <non-nullable datetime field> IS NULL in WHERE