From a1e9539b62bdda3651e5b152db21586bc7a3e47e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 3 May 2006 19:01:29 +0500 Subject: [PATCH] merging fix --- mysql-test/t/innodb.test | 6 ------ mysql-test/t/sp_notembedded.test | 1 - 2 files changed, 7 deletions(-) diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 703e3b311b9..e4c8bf89cca 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -2190,12 +2190,6 @@ SELECT DISTINCT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; drop table t2, t1; -create table t2(a date, key(a)) engine=innodb; -insert into t1 values('2005-10-01'); -insert into t2 values('2005-10-01'); -select * from t1, t2 - where t2.a between t1.a - interval 2 day and t1.a + interval 2 day; -drop table t1, t2; # # Bug #15680 (SPATIAL key in innodb) diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test index 893884b302f..0adbeb2d98b 100644 --- a/mysql-test/t/sp_notembedded.test +++ b/mysql-test/t/sp_notembedded.test @@ -265,4 +265,3 @@ drop view v1| drop table t3| delimiter ;| -drop table t3;