Added test cases for LP bug #798625 and LP bug #800085

fixed by the patch for LP bug 798621.

2 files changed, 32 insertions, 0 deletions

diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
index b989bfbcf24..3cf8bd92512 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -369,3 +369,19 @@ SELECT * FROM v1, t1 WHERE v1.b=t1.a  ORDER BY v1.a;
 
 DROP VIEW v1;
 DROP TABLE t1,t2;
+
+--echo #
+--echo #  LP bug #800085: crash with a query using a simple derived table 
+--echo #                  (fixed by the patch for bug 798621)
+--echo #
+
+CREATE TABLE t1 (f1 int, f2 varchar(32)) ;
+INSERT INTO t1 VALUES (NULL,'j'), (8,'c');
+
+CREATE TABLE t2 (f1 int);
+INSERT INTO t2 VALUES (1), (5);
+
+SELECT DISTINCT t.f1 FROM (SELECT * FROM t1) AS t, t2
+  WHERE t.f2='s' AND t.f2 LIKE '%a%' OR t.f1<>0 ORDER BY t.f2;
+
+DROP TABLE t1, t2;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 2c5b65a2bbc..5d148facb9e 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -4156,6 +4156,22 @@ SELECT * FROM v1 LEFT JOIN t2 ON t2.a = v1.a
 DROP VIEW v1;
 DROP TABLE t1,t2;
 
+--echo # Bug#798625: duplicate of the previous one, but without crash  
+
+CREATE TABLE t1 (f1 int NOT NULL, f2 int, f3 int, f4 varchar(32), f5 int) ;
+INSERT INTO t1 VALUES (20,5,2,'r', 0);
+
+CREATE VIEW v1 AS SELECT * FROM t1;
+
+SELECT v1.f4 FROM v1 
+  WHERE f1<>0 OR f2<>0 AND f4='v' AND (f2<>0 OR f3<>0 AND f5<>0 OR f4 LIKE '%b%');
+EXPLAIN EXTENDED
+SELECT v1.f4 FROM v1 
+  WHERE f1<>0 OR f2<>0 AND f4='v' AND (f2<>0 OR f3<>0 AND f5<>0 OR f4 LIKE '%b%');
+
+DROP VIEW v1;
+DROP TABLE t1;
+
 --echo #
 --echo # Bug#798576: abort on a GROUP BY query over a view with left join 
 --echo #             that can be converted to inner join