summaryrefslogtreecommitdiff
path: root/mysql-test/t/join_outer.test
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-05-04 21:56:45 -0700
committerIgor Babaev <igor@askmonty.org>2013-05-04 21:56:45 -0700
commit75befe7526c6bdb38c042695fd302c037e59409d (patch)
tree2ad7d1dcf2fe25ebfafc64a32054cd1489d478f2 /mysql-test/t/join_outer.test
parentddd341b71ae6b9c2dd206df64c662c0a29730ae9 (diff)
parent920c479c6ebd2236dbe5510e5ed8b748bf0ee158 (diff)
downloadmariadb-git-75befe7526c6bdb38c042695fd302c037e59409d.tar.gz
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/t/join_outer.test')
-rw-r--r--mysql-test/t/join_outer.test17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index 44f4afd451b..a325d0b6233 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -1622,4 +1622,21 @@ ORDER BY t1.b;
DROP TABLE t1,t2;
+--echo #
+--echo # Bug mdev-4336: LEFT JOIN with disjunctive
+--echo # <non-nullable datetime field> IS NULL in WHERE
+--echo # causes a hang and eventual crash
+--echo #
+
+CREATE TABLE t1 (
+ id int(11) NOT NULL,
+ modified datetime NOT NULL,
+ PRIMARY KEY (id)
+);
+
+SELECT a.* FROM t1 a LEFT JOIN t1 b ON a.id = b.id
+ WHERE a.modified > b.modified or b.modified IS NULL;
+
+DROP TABLE t1;
+
SET optimizer_switch=@save_optimizer_switch;