bk commit into 5.0 tree (aivanov:1.2153)

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.2153 06/04/21 01:37:31 aivanov@stripped +2 -0
  Restoring changes erroneously removed by applying
   the innodb-5.0-ss476 snapshot.

  mysql-test/t/innodb.test
    1.131 06/04/21 01:37:26 aivanov@stripped +12 -0
    Restoring changes erroneously removed by applying
     the innodb-5.0-ss476 snapshot.

  mysql-test/r/innodb.result
    1.161 06/04/21 01:37:26 aivanov@stripped +10 -1
    Restoring changes erroneously removed by applying
     the innodb-5.0-ss476 snapshot.

# 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:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/innodb/mysql-5.0-work

--- 1.160/mysql-test/r/innodb.result	2006-04-21 01:07:33 +04:00
+++ 1.161/mysql-test/r/innodb.result	2006-04-21 01:37:26 +04:00
@@ -1821,7 +1821,7 @@
 innodb_sync_spin_loops	20
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
-innodb_thread_concurrency	0
+innodb_thread_concurrency	8
 set global innodb_thread_concurrency=1001;
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
@@ -3232,5 +3232,14 @@
 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 (DB_ROW_ID int) engine=innodb;
 ERROR HY000: Can't create table './test/t1.frm' (errno: -1)

--- 1.130/mysql-test/t/innodb.test	2006-04-21 01:07:33 +04:00
+++ 1.131/mysql-test/t/innodb.test	2006-04-21 01:37:26 +04:00
@@ -2128,6 +2128,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;
+
 # bug 18934, "InnoDB crashes when table uses column names like DB_ROW_ID"
 --error 1005
 CREATE TABLE t1 (DB_ROW_ID int) engine=innodb;