summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-04-23 16:05:11 +0400
committerunknown <aivanov@mysql.com>2006-04-23 16:05:11 +0400
commit9935dcc7bd14a30733768d782f729701f3e4ab16 (patch)
tree240462b24469975352bebd04e001f3befc157b74
parentb4969bbb84fd014fc12d232e6874961a133e3950 (diff)
downloadmariadb-git-9935dcc7bd14a30733768d782f729701f3e4ab16.tar.gz
Corrected merge mistake.
-rw-r--r--mysql-test/t/innodb.test13
1 files changed, 1 insertions, 12 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 55316988bdb..bcd80c18326 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -2113,18 +2113,6 @@ disconnect a;
disconnect b;
#
-# Bug #14360: problem with intervals
-#
-
-create table t1(a date) engine=innodb;
-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;
-
-#
# Test that cascading updates leading to duplicate keys give the correct
# error message (bug #9680)
#
@@ -2176,6 +2164,7 @@ alter table t1 drop foreign key c2_fk;
show create table t1;
#
drop table t1, t2;
+
#
# Bug #14360: problem with intervals
#