Commit 79b9673b authored by unknown's avatar unknown
Browse files

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
parents b00ae812 0564fc4e

mysql-test/r/innodb_unsafe_binlog.result

0 → 100644
+48 −0
Original line number Diff line number Diff line 
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;

mysql-test/t/innodb_unsafe_binlog-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--innodb_locks_unsafe_for_binlog=true

mysql-test/t/innodb_unsafe_binlog.test

0 → 100644
+67 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc

#

# Note that these tests uses a innodb_locks_unsafe_for_binlog option.

#

# Test cases for a bug #15650 DELETE with LEFT JOIN crashes server

#



--disable_warnings

drop table if exists t1,t2;

--enable_warnings

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;

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;

drop table t1,t2;



#

# Test case for unlock row bug where unlock releases all locks granted for

# a row. Only the latest lock should be released.

#



connect (a,localhost,root,,);

connect (b,localhost,root,,);

connection a;

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;

update t1 set b = 5 where b = 1;

connection b;

set autocommit = 0;

#

# S-lock to records (2,2),(4,2), and (6,2) should not be released in a update

#

--error 1205

select * from t1 where a = 2 and b = 2 for update;

connection a;

commit;

connection b;

commit;

drop table t1;

disconnect a;

disconnect b;