Fixes after manual merge.

1 files changed, 12 insertions, 11 deletions

diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 9c8c54f2b55..83b167def73 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -2086,6 +2086,18 @@ 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)
 #
@@ -2137,14 +2149,3 @@ alter table t1 drop foreign key c2_fk;
 show create table t1;
 #
 drop table t1, t2;
-
-# 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;