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 mysql.com:/home/pz/mysql/mysql-4.1-root

Browse Source 
into mysql.com:/home/pz/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2002-10-30 18:03:09 +03:00
parent 03437238ee 1de7b50274
commit 77abf6d4b2
1214 changed files with 171314 additions and 58295 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;