summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb.result
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-04-21 01:37:31 +0400
committerunknown <aivanov@mysql.com>2006-04-21 01:37:31 +0400
commit43690501264081229fc91f66600e1b11b40994cc (patch)
tree60caded9c2d69d4b0d470daecb2c1c89cfe97225 /mysql-test/r/innodb.result
parent7ee05d7c713c0958cd56248b7b7397d72fea3941 (diff)
downloadmariadb-git-43690501264081229fc91f66600e1b11b40994cc.tar.gz
Restoring changes erroneously removed by applying
the innodb-5.0-ss476 snapshot.
Diffstat (limited to 'mysql-test/r/innodb.result')
-rw-r--r--mysql-test/r/innodb.result11
1 files changed, 10 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)