~drizzle-trunk/drizzle/development

1 by brian
clean slate
1
#
1567.1.4 by Brian Aker
Remove dead .opt files. Removed two options from Innodb which do not relate
2
# This once provided compatibility for innodb_rollback_on_timeout, now it is
3
# just a test feeder file for innodb-myisam
4
#
1 by brian
clean slate
5
#
6
--disable_warnings
7
drop table if exists t1;
8
--enable_warnings
9
413.2.2 by Brian Aker
Removed UNSIGNED from parser.
10
create table t1 (a int not null primary key) engine = innodb;
1 by brian
clean slate
11
insert into t1 values (1);
12
commit;
13
connect (con1,localhost,root,,);
14
connect (con2,localhost,root,,);
15
16
connection con2;
17
begin work;
18
insert into t1 values (2);
19
select * from t1;
20
21
connection con1;
22
begin work;
23
insert into t1 values (5);
24
select * from t1;
25
# Lock wait timeout set to 2 seconds in <THIS TEST>-master.opt; this
26
# statement will time out; in 5.0.13+, it will not roll back transaction.
27
--error ER_LOCK_WAIT_TIMEOUT
28
insert into t1 values (2);
29
# On 5.0.13+, this should give ==> 1, 5
30
select * from t1;
31
commit;
32
33
connection con2;
34
select * from t1;
35
commit;
36
37
connection default;
38
select * from t1;
39
drop table t1;
40
disconnect con1;
41
disconnect con2;