mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge
sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/subselect.result: SCCS merged mysql-test/t/subselect.test: SCCS merged
This commit is contained in:
unknown
commit
4383ef1377
10 changed files with 218 additions and 44 deletions
76
mysql-test/r/innodb-non-simple.result
Normal file
76
mysql-test/r/innodb-non-simple.result
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
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;
|
||||
|
|
@ -319,3 +319,19 @@ SELECT 1 FROM (SELECT a FROM t1) HAVING (SELECT a)=1;
|
|||
1
|
||||
1
|
||||
drop table t1;
|
||||
create table t1 (a int NOT NULL, b int, primary key (a));
|
||||
create table t2 (a int NOT NULL, b int, primary key (a));
|
||||
insert into t1 values (0, 10),(1, 11),(2, 12);
|
||||
insert into t2 values (1, 21),(2, 22),(3, 23);
|
||||
select * from t1;
|
||||
a b
|
||||
0 10
|
||||
1 11
|
||||
2 12
|
||||
update t1 set b= (select b from t2 where t1.a = t2.a);
|
||||
select * from t1;
|
||||
a b
|
||||
0 NULL
|
||||
1 21
|
||||
2 22
|
||||
drop table t1, t2;
|
||||
|
|
|
|||
76
mysql-test/t/innodb-non-simple.test
Normal file
76
mysql-test/t/innodb-non-simple.test
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
-- 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;
|
||||
|
|
@ -203,4 +203,15 @@ drop table t1;
|
|||
CREATE TABLE t1 (a int(1));
|
||||
INSERT INTO t1 VALUES (1);
|
||||
SELECT 1 FROM (SELECT a FROM t1) HAVING (SELECT a)=1;
|
||||
drop table t1;
|
||||
drop table t1;
|
||||
|
||||
#update with subselects
|
||||
create table t1 (a int NOT NULL, b int, primary key (a));
|
||||
create table t2 (a int NOT NULL, b int, primary key (a));
|
||||
insert into t1 values (0, 10),(1, 11),(2, 12);
|
||||
insert into t2 values (1, 21),(2, 22),(3, 23);
|
||||
select * from t1;
|
||||
update t1 set b= (select b from t2 where t1.a = t2.a);
|
||||
select * from t1;
|
||||
drop table t1, t2;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue