mirror of
https://github.com/MariaDB/server.git
synced 2025-08-29 00:08:14 +03:00
Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge Null-merge InnoDB snapshots from 5.0 to 5.1 storage/innobase/include/lock0lock.h: Auto merged mysql-test/r/innodb.result: null-merge from 5.0 mysql-test/t/innodb.test: null-merge from 5.0 sql/ha_innodb.cc: null-merge from 5.0 storage/innobase/include/data0type.h: null-merge from 5.0 storage/innobase/include/data0type.ic: null-merge from 5.0 storage/innobase/include/os0file.h: null-merge from 5.0 storage/innobase/include/row0mysql.h: null-merge from 5.0 storage/innobase/lock/lock0lock.c: null-merge from 5.0 storage/innobase/os/os0file.c: null-merge from 5.0 storage/innobase/row/row0ins.c: null-merge from 5.0 storage/innobase/row/row0mysql.c: null-merge from 5.0 storage/innobase/row/row0sel.c: null-merge from 5.0 storage/innobase/trx/trx0trx.c: null-merge from 5.0
This commit is contained in:
48
mysql-test/r/innodb_unsafe_binlog.result
Normal file
48
mysql-test/r/innodb_unsafe_binlog.result
Normal file
@@ -0,0 +1,48 @@
|
||||
drop table if exists t1,t2;
|
||||
create table t1 (id int not null, f_id int not null, f int not null,
|
||||
primary key(f_id, id)) engine=innodb;
|
||||
create table t2 (id int not null,s_id int not null,s varchar(200),
|
||||
primary key(id)) engine=innodb;
|
||||
INSERT INTO t1 VALUES (8, 1, 3);
|
||||
INSERT INTO t1 VALUES (1, 2, 1);
|
||||
INSERT INTO t2 VALUES (1, 0, '');
|
||||
INSERT INTO t2 VALUES (8, 1, '');
|
||||
commit;
|
||||
DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)
|
||||
WHERE mm.id IS NULL;
|
||||
select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)
|
||||
where mm.id is null lock in share mode;
|
||||
id f_id f
|
||||
drop table t1,t2;
|
||||
create table t1 (id int not null, f_id int not null, f int not null,
|
||||
primary key(id),key(f_id)) engine=innodb;
|
||||
create table t2 (id int not null,s_id int not null,s varchar(200),
|
||||
primary key(id),key(s_id)) engine=innodb;
|
||||
INSERT INTO t1 VALUES (8, 1, 3);
|
||||
INSERT INTO t1 VALUES (1, 2, 1);
|
||||
INSERT INTO t2 VALUES (1, 0, '');
|
||||
INSERT INTO t2 VALUES (8, 1, '');
|
||||
commit;
|
||||
delete ml.* from t1 as ml left join t2 as mm on (mm.s_id=ml.f_id) where mm.s is null;
|
||||
select ml.* from t1 as ml left join t2 as mm on (mm.s_id=ml.f_id) where mm.s is null lock in share mode;
|
||||
id f_id f
|
||||
drop table t1,t2;
|
||||
create table t1(a int not null, b int, primary key(a)) engine=innodb;
|
||||
insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);
|
||||
commit;
|
||||
set autocommit = 0;
|
||||
select * from t1 lock in share mode;
|
||||
a b
|
||||
1 1
|
||||
2 2
|
||||
3 1
|
||||
4 2
|
||||
5 1
|
||||
6 2
|
||||
update t1 set b = 5 where b = 1;
|
||||
set autocommit = 0;
|
||||
select * from t1 where a = 2 and b = 2 for update;
|
||||
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
||||
commit;
|
||||
commit;
|
||||
drop table t1;
|
Reference in New Issue
Block a user