diff options
| author | holyfoot@deer.(none) <> | 2006-05-03 19:01:29 +0500 |
|---|---|---|
| committer | holyfoot@deer.(none) <> | 2006-05-03 19:01:29 +0500 |
| commit | 5b5db01a46acd8e97d1b207913e350511cd975c2 (patch) | |
| tree | edf1e63c25d823d1e134ea67b2bccfbaf06a7f44 | |
| parent | 81e625ac4a6e3bf1a931b302309c7271bf9dfa6a (diff) | |
| download | mariadb-git-5b5db01a46acd8e97d1b207913e350511cd975c2.tar.gz | |
merging fix
| -rw-r--r-- | mysql-test/t/innodb.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/sp_notembedded.test | 1 |
2 files changed, 0 insertions, 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; |