database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/marty/MySQL/mysql-4.1

Browse Source 
into  mysql.com:/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Merge (using local)
This commit is contained in:
unknown
2006-06-12 09:42:20 +02:00
parent e3a975c5d6 a3f3696697
commit 8ea1058455
2 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
mysql-test/r/ndb_lock.result
View File

@ -63,62 +63,89 @@ pk u o
5 5 5 5 5 5
insert into t1 values (1,1,1); insert into t1 values (1,1,1);
drop table t1; drop table t1;
create table t1 (x integer not null primary key, y varchar(32)) engine = ndb; create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
insert into t1 values (1,'one'), (2,'two'),(3,"three"); insert into t1 values (1,'one',1), (2,'two',2),(3,"three",3);
begin; begin;
select * from t1 where x = 1 for update; select * from t1 where x = 1 for update;
x y x y z
1 one 1 one 1
begin; begin;
select * from t1 where x = 2 for update; select * from t1 where x = 2 for update;
x y x y z
2 two 2 two 2
select * from t1 where x = 1 for update; select * from t1 where x = 1 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback; rollback;
commit; commit;
begin; begin;
select * from t1 where y = 'one' or y = 'three' for update; select * from t1 where y = 'one' or y = 'three' for update;
x y x y z
3 three 3 three 3
1 one 1 one 1
begin; begin;
select * from t1 where x = 2 for update; select * from t1 where x = 2 for update;
x y x y z
2 two 2 two 2
select * from t1 where x = 1 for update; select * from t1 where x = 1 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback; rollback;
commit; commit;
begin; begin;
select * from t1 where x = 1 lock in share mode; select * from t1 where z > 1 and z < 3 for update;
x y x y z
1 one 2 two 2
begin;
select * from t1 where x = 1 for update;
x y z
1 one 1
select * from t1 where x = 2 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback;
commit;
begin; begin;
select * from t1 where x = 1 lock in share mode; select * from t1 where x = 1 lock in share mode;
x y x y z
1 one 1 one 1
begin;
select * from t1 where x = 1 lock in share mode;
x y z
1 one 1
select * from t1 where x = 2 for update; select * from t1 where x = 2 for update;
x y x y z
2 two 2 two 2
select * from t1 where x = 1 for update; select * from t1 where x = 1 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback; rollback;
commit; commit;
begin; begin;
select * from t1 where y = 'one' or y = 'three' lock in share mode; select * from t1 where y = 'one' or y = 'three' lock in share mode;
x y x y z
3 three 3 three 3
1 one 1 one 1
begin; begin;
select * from t1 where y = 'one' lock in share mode; select * from t1 where y = 'one' lock in share mode;
x y x y z
1 one 1 one 1
select * from t1 where x = 2 for update; select * from t1 where x = 2 for update;
x y x y z
2 two 2 two 2
select * from t1 where x = 1 for update; select * from t1 where x = 1 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback; rollback;
commit; commit;
begin;
select * from t1 where z > 1 and z < 3 lock in share mode;
x y z
2 two 2
begin;
select * from t1 where z = 1 lock in share mode;
x y z
1 one 1
select * from t1 where x = 1 for update;
x y z
1 one 1
select * from t1 where x = 2 for update;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
rollback;
commit;
drop table t1; drop table t1;

43
mysql-test/t/ndb_lock.test
View File

@ -71,9 +71,9 @@ drop table t1;
# Lock for update # Lock for update
create table t1 (x integer not null primary key, y varchar(32)) engine = ndb; create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
insert into t1 values (1,'one'), (2,'two'),(3,"three"); insert into t1 values (1,'one',1), (2,'two',2),(3,"three",3);
# PK access # PK access
connection con1; connection con1;
@ -90,7 +90,7 @@ rollback;
connection con1; connection con1;
commit; commit;
# scan # table scan
connection con1; connection con1;
begin; begin;
select * from t1 where y = 'one' or y = 'three' for update; select * from t1 where y = 'one' or y = 'three' for update;
@ -107,6 +107,23 @@ rollback;
connection con1; connection con1;
commit; commit;
# index scan
connection con1;
begin;
select * from t1 where z > 1 and z < 3 for update;
connection con2;
begin;
# Have to check with pk access here since scans take locks on
# all rows and then release them in chunks
select * from t1 where x = 1 for update;
--error 1205
select * from t1 where x = 2 for update;
rollback;
connection con1;
commit;
# share locking # share locking
# PK access # PK access
@ -125,7 +142,7 @@ rollback;
connection con1; connection con1;
commit; commit;
# scan # table scan
connection con1; connection con1;
begin; begin;
select * from t1 where y = 'one' or y = 'three' lock in share mode; select * from t1 where y = 'one' or y = 'three' lock in share mode;
@ -143,6 +160,24 @@ rollback;
connection con1; connection con1;
commit; commit;
# index scan
connection con1;
begin;
select * from t1 where z > 1 and z < 3 lock in share mode;
connection con2;
begin;
select * from t1 where z = 1 lock in share mode;
# Have to check with pk access here since scans take locks on
# all rows and then release them in chunks
select * from t1 where x = 1 for update;
--error 1205
select * from t1 where x = 2 for update;
rollback;
connection con1;
commit;
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests