diff options
| author | unknown <aivanov@mysql.com> | 2006-04-21 01:37:31 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-04-21 01:37:31 +0400 |
| commit | b2a8a56434d0630fb3cd519fad41697eead651a5 (patch) | |
| tree | 60caded9c2d69d4b0d470daecb2c1c89cfe97225 | |
| parent | a446ec7731970e4a12b9e8f1a6c0d3231083059d (diff) | |
| download | mariadb-git-b2a8a56434d0630fb3cd519fad41697eead651a5.tar.gz | |
Restoring changes erroneously removed by applying
the innodb-5.0-ss476 snapshot.
| -rw-r--r-- | mysql-test/r/innodb.result | 11 | ||||
| -rw-r--r-- | mysql-test/t/innodb.test | 12 |
2 files changed, 22 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index e8953a18a2e..27e527c43ee 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1821,7 +1821,7 @@ Variable_name Value 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 t2t; 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 +2005-10-01 2005-10-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) diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index df3b473dcc0..ccd2be5cdba 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -2128,6 +2128,18 @@ connection default; 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; |