bk commit into 5.1 tree (msvensson:1.2339)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2339 06/04/22 12:11:32 msvensson@neptunus.(none) +5 -0
  Merge bk-internal:/home/bk/mysql-5.1-new
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  mysql-test/t/innodb.test
    1.138 06/04/22 12:11:24 msvensson@neptunus.(none) +13 -0
    Manual merge

  sql/sql_insert.cc
    1.199 06/04/22 12:07:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item_timefunc.h
    1.69 06/04/22 12:07:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item_timefunc.cc
    1.113 06/04/22 12:07:43 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.171 06/04/22 12:07:42 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.170/mysql-test/r/innodb.result	2006-04-18 09:57:45 +02:00
+++ 1.171/mysql-test/r/innodb.result	2006-04-22 12:07:42 +02:00
@@ -3233,6 +3233,15 @@
 drop trigger t3t;
 drop trigger t4t;
 drop table t1, t2, t3, t4, t5;
+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;
+a	a
[phone]-01
+drop table t1, t2;
 CREATE TABLE t1 (
 field1 varchar(8) NOT NULL DEFAULT '',
 field2 varchar(8) NOT NULL DEFAULT '',
@@ -3281,13 +3290,4 @@
   PRIMARY KEY (`c1`),
   UNIQUE KEY `c2` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-drop table t1, t2;
-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;
-a	a
-2005-10-01	2005-10-01
 drop table t1, t2;

--- 1.137/mysql-test/t/innodb.test	2006-04-18 09:57:45 +02:00
+++ 1.138/mysql-test/t/innodb.test	2006-04-22 12:11:24 +02:00
@@ -2130,6 +2130,18 @@
 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)
 #
@@ -2182,6 +2194,8 @@
 #
 drop table t1, t2;
 
+
+#
 # Bug #14360: problem with intervals
 #