database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Updated results after merge from 3.23

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2002-11-24 21:39:22 +02:00
parent a976101661
commit 7dede8d303
3 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/innodb-deadlock.result Normal file
View File

@ -0,0 +1,20 @@
drop table if exists t1;
create table t1 (id integer, x integer) type=INNODB;
insert into t1 values(0, 0);
set autocommit=0;
SELECT * from t1 where id = 0 FOR UPDATE;
id x
0 0
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
commit;
commit;
select * from t1;
id x
0 2
commit;
drop table t1;

16
mysql-test/r/null_key.result
View File

@ -228,20 +228,36 @@ alter table t1 add key id (id);
select * from t1, t2 where t1.id = t2.id; select * from t1, t2 where t1.id = t2.id;
id id id id
drop table t1,t2; drop table t1,t2;
create table t1 (
id integer,
id2 integer not null,
index (id),
index (id2)
);
insert into t1 values(null,null),(1,1);
select * from t1;
id id2 id id2
NULL 0 NULL 0
1 1 1 1
select * from t1 where id <=> null;
id id2 id id2
NULL 0 NULL 0
select * from t1 where id <=> null or id > 0;
id id2 id id2
NULL 0 NULL 0
1 1 1 1
select * from t1 where id is null or id > 0;
id id2 id id2
NULL 0 NULL 0
1 1 1 1
select * from t1 where id2 <=> null or id2 > 0;
id id2 id id2
1 1 1 1
select * from t1 where id2 is null or id2 > 0;
id id2 id id2
1 1 1 1
delete from t1 where id <=> NULL;
select * from t1;
id id2 id id2
1 1 1 1
drop table t1;

38
mysql-test/t/innodb-deadlock.test Normal file
View File

@ -0,0 +1,38 @@
-- source include/have_innodb.inc
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
drop table if exists t1;
#
# Testing of FOR UPDATE
#
connection con1;
create table t1 (id integer, x integer) type=INNODB;
insert into t1 values(0, 0);
set autocommit=0;
SELECT * from t1 where id = 0 FOR UPDATE;
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;