Commit a1e9539b authored by unknown's avatar unknown

merging fix

parent 66edfe28
...@@ -2190,12 +2190,6 @@ SELECT DISTINCT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; ...@@ -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'; SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
drop table t2, t1; 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) # Bug #15680 (SPATIAL key in innodb)
......
...@@ -265,4 +265,3 @@ drop view v1| ...@@ -265,4 +265,3 @@ drop view v1|
drop table t3| drop table t3|
delimiter ;| delimiter ;|
drop table t3;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment