~drizzle-trunk/drizzle/development

Changed the semi-consistent test. With innodb_locks_unsafe_for_binlog, the behavior is different here (no next-key-locking for us)

added added

removed removed

create table t1(a int not null) engine=innodb;

insert into t1 values (1),(2),(3),(4),(5),(6),(7);

set autocommit=0;

# this should lock the entire table

# we have locks_unsafe_for_binlog on by default. this should work.

select * from t1 where a=3 lock in share mode;

connection b;

set session transaction isolation level read committed;

set autocommit=0;

update t1 set a=10 where a=5;

connection a;

commit;

update t1 set a=11 where a=6;

-- error ER_LOCK_WAIT_TIMEOUT

update t1 set a=12 where a=2;

update t1 set a=13 where a=1;

connection a;

commit;