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 rkalimullin@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.r18.ru:/usr/home/ram/mysql-4.1
This commit is contained in:
unknown
2002-10-30 16:02:02 +04:00
parent e086000f19 155e78f014
commit b1de1ef15e
1191 changed files with 171164 additions and 58171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/bdb-deadlock.result
View File

@ -9,23 +9,23 @@ set autocommit=0;
update t2 set x = 1 where id = 0;
select x from t1 where id = 0;
select x from t2 where id = 0;
commit;
Deadlock found when trying to get lock; Try restarting transaction
commit;
x
1
commit;
select * from t1;
id x
0 1
select * from t2;
id x
0 1
commit;
select * from t1;
id x
0 1
select * from t1;
select * from t2;
id x
0 1
commit;
id x
0 1
drop table t1,t2;

11
mysql-test/t/bdb-deadlock.test
View File

@ -30,13 +30,17 @@ select x from t1 where id = 0;
connection con1;
# This should generate a deadlock as we are trying to access a locked row
--error 1213
--send
select x from t2 where id = 0;
connection con2;
--error 1213
commit;
connection con1;
commit;
connection con2;
reap;
commit;
select * from t1;
select * from t2;
commit;
@ -45,4 +49,5 @@ connection con1;
select * from t1;
select * from t2;
commit;
drop table t1,t2;