mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 07:05:33 +02:00
merging tests
BitKeeper/deleted/.del-innodb-non-simple.test~380a6ef42b6e15d1: Delete: mysql-test/t/innodb-non-simple.test BitKeeper/deleted/.del-innodb-non-simple.result~2f77d5b0aaf5aa90: Delete: mysql-test/r/innodb-non-simple.result
This commit is contained in:
unknown
parent
4383ef1377
commit
52f18046c4
4 changed files with 150 additions and 152 deletions
|
|
@ -18,3 +18,80 @@ id x
|
|||
0 2
|
||||
commit;
|
||||
drop table t1;
|
||||
drop table if exists t1, t2;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 10), (1, 20), (2, 30);
|
||||
commit;
|
||||
set autocommit=0;
|
||||
select * from t2;
|
||||
b a
|
||||
0 10
|
||||
1 20
|
||||
2 30
|
||||
update t2 set a=100 where b=(SELECT x from t1 where id = b FOR UPDATE);
|
||||
select * from t2;
|
||||
b a
|
||||
0 100
|
||||
1 20
|
||||
2 30
|
||||
select * from t1;
|
||||
id x
|
||||
0 0
|
||||
300 300
|
||||
set autocommit=0;
|
||||
update t1 set x=2 where id = 0;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
id x
|
||||
0 1
|
||||
300 300
|
||||
commit;
|
||||
commit;
|
||||
select * from t1;
|
||||
id x
|
||||
0 2
|
||||
300 300
|
||||
commit;
|
||||
drop table t1, t2;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 0), (1, 20), (2, 30);
|
||||
commit;
|
||||
select a,b from t2 UNION SELECT id, x from t1 FOR UPDATE;
|
||||
a b
|
||||
0 0
|
||||
20 1
|
||||
30 2
|
||||
300 300
|
||||
select * from t2;
|
||||
b a
|
||||
0 0
|
||||
1 20
|
||||
2 30
|
||||
select * from t1;
|
||||
id x
|
||||
0 0
|
||||
300 300
|
||||
update t2 set a=2 where b = 0;
|
||||
select * from t2;
|
||||
b a
|
||||
0 2
|
||||
1 20
|
||||
2 30
|
||||
update t1 set x=2 where id = 0;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
id x
|
||||
0 1
|
||||
300 300
|
||||
commit;
|
||||
commit;
|
||||
select * from t1;
|
||||
id x
|
||||
0 2
|
||||
300 300
|
||||
commit;
|
||||
drop table t1, t2;
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
drop table if exists t1, t2;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 10), (1, 20), (2, 30);
|
||||
set autocommit=0;
|
||||
select * from t2;
|
||||
b a
|
||||
0 10
|
||||
1 20
|
||||
2 30
|
||||
update t2 set a=100 where b=(SELECT x from t1 where id = b FOR UPDATE);
|
||||
select * from t2;
|
||||
b a
|
||||
0 100
|
||||
1 20
|
||||
2 30
|
||||
select * from t1;
|
||||
id x
|
||||
0 0
|
||||
300 300
|
||||
set autocommit=0;
|
||||
update t1 set x=2 where id = 0;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
id x
|
||||
0 1
|
||||
300 300
|
||||
commit;
|
||||
commit;
|
||||
select * from t1;
|
||||
id x
|
||||
0 2
|
||||
300 300
|
||||
commit;
|
||||
drop table t1, t2;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 0), (1, 20), (2, 30);
|
||||
commit;
|
||||
select a,b from t2 UNION SELECT id, x from t1 FOR UPDATE;
|
||||
a b
|
||||
0 0
|
||||
20 1
|
||||
30 2
|
||||
300 300
|
||||
select * from t2;
|
||||
b a
|
||||
0 0
|
||||
1 20
|
||||
2 30
|
||||
select * from t1;
|
||||
id x
|
||||
0 0
|
||||
300 300
|
||||
update t2 set a=2 where b = 0;
|
||||
select * from t2;
|
||||
b a
|
||||
0 2
|
||||
1 20
|
||||
2 30
|
||||
update t1 set x=2 where id = 0;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
id x
|
||||
0 1
|
||||
300 300
|
||||
commit;
|
||||
commit;
|
||||
select * from t1;
|
||||
id x
|
||||
0 2
|
||||
300 300
|
||||
commit;
|
||||
drop table t1, t2;
|
||||
|
|
@ -36,3 +36,76 @@ select * from t1;
|
|||
commit;
|
||||
|
||||
drop table t1;
|
||||
drop table if exists t1, t2;
|
||||
#
|
||||
# Testing of FOR UPDATE
|
||||
#
|
||||
|
||||
connection con1;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 10), (1, 20), (2, 30);
|
||||
commit;
|
||||
set autocommit=0;
|
||||
select * from t2;
|
||||
update t2 set a=100 where b=(SELECT x from t1 where id = b FOR UPDATE);
|
||||
select * from t2;
|
||||
select * from t1;
|
||||
|
||||
connection con2;
|
||||
set autocommit=0;
|
||||
|
||||
# The following query should hang because con1 is locking the page
|
||||
--send
|
||||
update t1 set x=2 where id = 0;
|
||||
--sleep 2;
|
||||
|
||||
connection con1;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
connection con2;
|
||||
reap;
|
||||
commit;
|
||||
|
||||
connection con1;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
drop table t1, t2;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 0), (1, 20), (2, 30);
|
||||
commit;
|
||||
|
||||
connection con1;
|
||||
select a,b from t2 UNION SELECT id, x from t1 FOR UPDATE;
|
||||
select * from t2;
|
||||
select * from t1;
|
||||
|
||||
connection con2;
|
||||
|
||||
# The following query should hang because con1 is locking the page
|
||||
update t2 set a=2 where b = 0;
|
||||
select * from t2;
|
||||
--send
|
||||
update t1 set x=2 where id = 0;
|
||||
--sleep 2;
|
||||
|
||||
connection con1;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
connection con2;
|
||||
reap;
|
||||
commit;
|
||||
|
||||
connection con1;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
drop table t1, t2;
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
-- source include/have_innodb.inc
|
||||
|
||||
connect (con1,localhost,root,,);
|
||||
connect (con2,localhost,root,,);
|
||||
drop table if exists t1, t2;
|
||||
#
|
||||
# Testing of FOR UPDATE
|
||||
#
|
||||
|
||||
connection con1;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 10), (1, 20), (2, 30);
|
||||
set autocommit=0;
|
||||
select * from t2;
|
||||
update t2 set a=100 where b=(SELECT x from t1 where id = b FOR UPDATE);
|
||||
select * from t2;
|
||||
select * from t1;
|
||||
|
||||
connection con2;
|
||||
set autocommit=0;
|
||||
|
||||
# The following query should hang because con1 is locking the page
|
||||
--send
|
||||
update t1 set x=2 where id = 0;
|
||||
--sleep 2;
|
||||
|
||||
connection con1;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
connection con2;
|
||||
reap;
|
||||
commit;
|
||||
|
||||
connection con1;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
drop table t1, t2;
|
||||
create table t1 (id integer, x integer) type=INNODB;
|
||||
create table t2 (b integer, a integer) type=INNODB;
|
||||
insert into t1 values(0, 0), (300, 300);
|
||||
insert into t2 values(0, 0), (1, 20), (2, 30);
|
||||
commit;
|
||||
|
||||
connection con1;
|
||||
select a,b from t2 UNION SELECT id, x from t1 FOR UPDATE;
|
||||
select * from t2;
|
||||
select * from t1;
|
||||
|
||||
connection con2;
|
||||
|
||||
# The following query should hang because con1 is locking the page
|
||||
update t2 set a=2 where b = 0;
|
||||
select * from t2;
|
||||
--send
|
||||
update t1 set x=2 where id = 0;
|
||||
--sleep 2;
|
||||
|
||||
connection con1;
|
||||
update t1 set x=1 where id = 0;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
connection con2;
|
||||
reap;
|
||||
commit;
|
||||
|
||||
connection con1;
|
||||
select * from t1;
|
||||
commit;
|
||||
|
||||
drop table t1, t2;
|
||||
Loading…
Add table
Add a link
Reference in a new issue