mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
Merge mysql-5.1-innodb from bk-internal into my local branch
This commit is contained in:
Vasil Dimov
commit
39220e0bc2
4 changed files with 178 additions and 0 deletions
42
mysql-test/suite/innodb/r/innodb_bug49164.result
Normal file
42
mysql-test/suite/innodb/r/innodb_bug49164.result
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
CREATE TABLE bug49164 (a INT, b BIGINT, c TINYINT, PRIMARY KEY (a, b))
|
||||||
|
ENGINE=InnoDB;
|
||||||
|
insert into bug49164 values (1,1,1), (2,2,2), (3,3,3);
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 7
|
||||||
|
2 2 7
|
||||||
|
3 3 7
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 1
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
begin;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 1
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
commit;
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=6 where a=1 and b=1;
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 1
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
commit;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 6
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
drop table bug49164;
|
||||||
47
mysql-test/suite/innodb/t/innodb_bug49164.test
Normal file
47
mysql-test/suite/innodb/t/innodb_bug49164.test
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
-- source include/have_innodb.inc
|
||||||
|
|
||||||
|
# Bug #49164 READ-COMMITTED reports "matched: 0" on compound PK
|
||||||
|
# a duplicate of
|
||||||
|
# Bug #52663 Lost update incrementing column value under READ COMMITTED
|
||||||
|
|
||||||
|
connect (con1,localhost,root,,);
|
||||||
|
connect (con2,localhost,root,,);
|
||||||
|
|
||||||
|
connection con1;
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
|
||||||
|
CREATE TABLE bug49164 (a INT, b BIGINT, c TINYINT, PRIMARY KEY (a, b))
|
||||||
|
ENGINE=InnoDB;
|
||||||
|
|
||||||
|
insert into bug49164 values (1,1,1), (2,2,2), (3,3,3);
|
||||||
|
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
select * from bug49164;
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
|
||||||
|
connection con2;
|
||||||
|
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
begin;
|
||||||
|
select * from bug49164;
|
||||||
|
commit;
|
||||||
|
begin;
|
||||||
|
--send
|
||||||
|
update bug49164 set c=6 where a=1 and b=1;
|
||||||
|
|
||||||
|
connection con1;
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
connection con2;
|
||||||
|
reap;
|
||||||
|
commit;
|
||||||
|
connection con1;
|
||||||
|
select * from bug49164;
|
||||||
|
connection default;
|
||||||
|
disconnect con1;
|
||||||
|
disconnect con2;
|
||||||
|
drop table bug49164;
|
||||||
42
mysql-test/suite/innodb_plugin/r/innodb_bug49164.result
Normal file
42
mysql-test/suite/innodb_plugin/r/innodb_bug49164.result
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
CREATE TABLE bug49164 (a INT, b BIGINT, c TINYINT, PRIMARY KEY (a, b))
|
||||||
|
ENGINE=InnoDB;
|
||||||
|
insert into bug49164 values (1,1,1), (2,2,2), (3,3,3);
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 7
|
||||||
|
2 2 7
|
||||||
|
3 3 7
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 1
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
begin;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 1
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
commit;
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=6 where a=1 and b=1;
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 1
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
commit;
|
||||||
|
select * from bug49164;
|
||||||
|
a b c
|
||||||
|
1 1 6
|
||||||
|
2 2 2
|
||||||
|
3 3 3
|
||||||
|
drop table bug49164;
|
||||||
47
mysql-test/suite/innodb_plugin/t/innodb_bug49164.test
Normal file
47
mysql-test/suite/innodb_plugin/t/innodb_bug49164.test
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
-- source include/have_innodb_plugin.inc
|
||||||
|
|
||||||
|
# Bug #49164 READ-COMMITTED reports "matched: 0" on compound PK
|
||||||
|
# a duplicate of
|
||||||
|
# Bug #52663 Lost update incrementing column value under READ COMMITTED
|
||||||
|
|
||||||
|
connect (con1,localhost,root,,);
|
||||||
|
connect (con2,localhost,root,,);
|
||||||
|
|
||||||
|
connection con1;
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
|
||||||
|
CREATE TABLE bug49164 (a INT, b BIGINT, c TINYINT, PRIMARY KEY (a, b))
|
||||||
|
ENGINE=InnoDB;
|
||||||
|
|
||||||
|
insert into bug49164 values (1,1,1), (2,2,2), (3,3,3);
|
||||||
|
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
select * from bug49164;
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
begin;
|
||||||
|
update bug49164 set c=7;
|
||||||
|
|
||||||
|
connection con2;
|
||||||
|
|
||||||
|
SET tx_isolation = 'READ-COMMITTED';
|
||||||
|
begin;
|
||||||
|
select * from bug49164;
|
||||||
|
commit;
|
||||||
|
begin;
|
||||||
|
--send
|
||||||
|
update bug49164 set c=6 where a=1 and b=1;
|
||||||
|
|
||||||
|
connection con1;
|
||||||
|
rollback;
|
||||||
|
select * from bug49164;
|
||||||
|
connection con2;
|
||||||
|
reap;
|
||||||
|
commit;
|
||||||
|
connection con1;
|
||||||
|
select * from bug49164;
|
||||||
|
connection default;
|
||||||
|
disconnect con1;
|
||||||
|
disconnect con2;
|
||||||
|
drop table bug49164;
|
||||||
Loading…
Add table
Reference in a new issue