Made the optimizer switches 'derived_merge' and 'derived_with_keys'

off by default.

1 files changed, 0 insertions, 70 deletions

diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
index 3cf8bd92512..962cec95add 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -315,73 +315,3 @@ WHERE j = SUBSTRING('12', (SELECT * FROM (SELECT MIN(j) FROM t1) t2))) t3;
 DROP TABLE t1;
 
 --echo # End of 5.0 tests
-
---echo #
---echo #  LP bug #793436: query with a derived table for which optimizer proves
---echo #                  that it contains not more than 1 row
---echo #
-
-CREATE TABLE t1 (a int, KEY (a)) ;
-INSERT INTO t1 VALUES (3), (1);
-CREATE TABLE t2 (a int);
-INSERT INTO t2 VALUES (3);
-
-EXPLAIN
-SELECT * FROM (SELECT DISTINCT * FROM t2) t, t1  WHERE t1.a = t.a;
-SELECT * FROM (SELECT DISTINCT * FROM t2) t, t1  WHERE t1.a = t.a;
-
-DROP TABLE t1,t2;
-
---echo #
---echo #  LP bug #800518: crash with a query over a derived table
---echo #                  when a min/max optimization is applied
---echo #
-
-CREATE TABLE t1 (a int, b int, c varchar(10), INDEX idx(a,b)) ;
-INSERT INTO t1 VALUES 
-  (100, 3, 'xxx'), (200, 7, 'yyyyyyy'), (100, 1, 't'),
-  (200, 4, 'aaaa'), (100, 3, 'eee'), (100, 5, 'zzzzz');
-
-EXPLAIN
-SELECT MAX(b) FROM (SELECT * FROM t1) AS t WHERE a = 100;
-SELECT MAX(b) FROM (SELECT * FROM t1) AS t WHERE a = 100;
-
-DROP TABLE t1;
-
---echo #
---echo #  LP bug #799499: query over a materialized view 
---echo #                  accessed by a key
---echo #
-
-CREATE TABLE t1 (a int) ;
-INSERT INTO t1 VALUES (8);
-
-CREATE TABLE t2 (a int, b int) ;
-INSERT INTO t2 VALUES
-  (262, NULL), (253, 190), (260, NULL), (250, 163), (188, 8),
-  (257,200), (256, NULL), (255, 8), (249, NULL), (259, 7);
-
-CREATE VIEW v1 AS SELECT a, MIN(b) AS b FROM t2 GROUP BY a;
-
-EXPLAIN
-SELECT * FROM v1, t1 WHERE v1.b=t1.a  ORDER BY v1.a;
-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;