summaryrefslogtreecommitdiff
path: root/mysql-test/t/select.test
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-08-31 08:18:25 -0700
committerIgor Babaev <igor@askmonty.org>2013-08-31 08:18:25 -0700
commit880e16648355eb45dea0ee7eed6d0d9594f04b59 (patch)
tree1c66e3626e8f66533b862630f729e490b28e48b6 /mysql-test/t/select.test
parent59af095da430d539333c404b9ee372fd414d6bd3 (diff)
parent576a2b153320ab1fbfd4df06a30bf1f52e569cba (diff)
downloadmariadb-git-880e16648355eb45dea0ee7eed6d0d9594f04b59.tar.gz
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/t/select.test')
-rw-r--r--mysql-test/t/select.test23
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 47cd46f209e..3c56ef2837b 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -4582,5 +4582,28 @@ SELECT * FROM t1, t2
DROP TABLE t1,t2;
+--echo #
+--echo # Bug mdev-4971: equality propagation after merging degenerate
+--echo # disjunction into embedding AND level
+--echo #
+
+CREATE TABLE t1 (pk1 int, a1 int, b1 int, PRIMARY KEY(pk1)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (1,10,100), (2,20,200) ;
+
+CREATE TABLE t2 (pk2 int, a2 int, PRIMARY KEY(pk2)) ENGINE=MyISAM;
+INSERT INTO t2 VALUES (1,1);
+
+SELECT * FROM t1, t2
+ WHERE a1 = pk2 AND ( ( b1 = 6 OR a2 > 4 ) AND pk2 = a2 OR pk1 IS NULL );
+EXPLAIN EXTENDED
+SELECT * FROM t1, t2
+ WHERE a1 = pk2 AND ( ( b1 = 6 OR a2 > 4 ) AND pk2 = a2 OR pk1 IS NULL );
+
+INSERT INTO t1 VALUES (3,1,6);
+SELECT * FROM t1, t2
+ WHERE a1 = pk2 AND ( ( b1 = 6 OR a2 > 4 ) AND pk2 = a2 OR pk1 IS NULL );
+
+DROP TABLE t1,t2;
+
--echo End of 5.3 tests