mirror of
https://github.com/MariaDB/server.git
synced 2025-11-03 14:33:32 +03:00
e5706080f0
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries extra/yassl/src/ssl.cpp: Removed compiler warning extra/yassl/taocrypt/src/asn.cpp: After merge fixes extra/yassl/testsuite/testsuite.cpp: Removed compiler warning mysql-test/r/ndb_lock.result: After merge fixes ndb/src/common/debugger/EventLogger.cpp: Removed compiler warning ndb/src/common/util/ConfigValues.cpp: Removed compiler warning ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warning ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Removed compiler warning ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Removed compiler warning ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp: Removed compiler warning ndb/src/kernel/vm/ndbd_malloc.cpp: Removed compiler warning ndb/src/mgmclient/main.cpp: Removed compiler warning ndb/src/ndbapi/SignalSender.cpp: Removed compiler warning sql/ha_ndbcluster.cc: Some extra safety sql/item_cmpfunc.cc: After merge fixes sql/item_subselect.cc: After merge fixes sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) support-files/compiler_warnings.supp: Removed some suppressed warnings
190 lines
3.9 KiB
Plaintext
190 lines
3.9 KiB
Plaintext
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
|
|
create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
|
|
insert into t1 values (1,'one'), (2,'two');
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
start transaction;
|
|
insert into t1 values (3,'three');
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
3 three
|
|
start transaction;
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
commit;
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
3 three
|
|
commit;
|
|
drop table t1;
|
|
create table t1 (pk integer not null primary key, u int not null, o int not null,
|
|
unique(u), key(o)) engine = ndb;
|
|
insert into t1 values (1,1,1), (2,2,2), (3,3,3), (4,4,4), (5,5,5);
|
|
lock tables t1 write;
|
|
delete from t1 where pk = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
lock tables t1 write;
|
|
delete from t1 where u = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
lock tables t1 write;
|
|
delete from t1 where o = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
drop table t1;
|
|
create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
|
|
insert into t1 values (1,'one',1);
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
rollback;
|
|
insert into t1 values (2,'two',2),(3,"three",3);
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' for update;
|
|
x y z
|
|
# # #
|
|
# # #
|
|
begin;
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' order by x for update;
|
|
x y z
|
|
1 one 1
|
|
3 three 3
|
|
begin;
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where z > 1 and z < 3 for update;
|
|
x y z
|
|
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;
|
|
Got one of the listed errors
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where x = 1 lock in share mode;
|
|
x y z
|
|
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;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' lock in share mode;
|
|
x y z
|
|
# # #
|
|
# # #
|
|
begin;
|
|
select * from t1 where y = 'one' lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' order by x lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
3 three 3
|
|
begin;
|
|
select * from t1 where y = 'one' lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
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;
|