Commit 43690501 authored by unknown's avatar unknown
Browse files

Restoring changes erroneously removed by applying 

 the innodb-5.0-ss476 snapshot.
parent 7ee05d7c

mysql-test/r/innodb.result

+10 −1
Original line number Diff line number Diff line
@@ -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)

mysql-test/t/innodb.test

+12 −0
Original line number Diff line number Diff line
@@ -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;