summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <ram@mysql.r18.ru>2002-11-12 19:21:11 +0400
committerunknown <ram@mysql.r18.ru>2002-11-12 19:21:11 +0400
commit73d667c4de6366e74cf7633b7246e7b840d718c0 (patch)
tree9554f1b3bb1e49fd2fc11a651de8564c3eaf90b1
parentf22f7c9d0bcb27d46e2c2f6f8e3f7cd889ff6e46 (diff)
downloadmariadb-git-73d667c4de6366e74cf7633b7246e7b840d718c0.tar.gz
bdb-deadlock test: added reap commands
-rw-r--r--mysql-test/r/bdb-deadlock.result8
-rw-r--r--mysql-test/t/bdb-deadlock.test2
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/bdb-deadlock.result b/mysql-test/r/bdb-deadlock.result
index 74798a34a53..55b3d3ea2a5 100644
--- a/mysql-test/r/bdb-deadlock.result
+++ b/mysql-test/r/bdb-deadlock.result
@@ -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;
diff --git a/mysql-test/t/bdb-deadlock.test b/mysql-test/t/bdb-deadlock.test
index 27fcb5c6149..5ecfe592ce4 100644
--- a/mysql-test/t/bdb-deadlock.test
+++ b/mysql-test/t/bdb-deadlock.test
@@ -35,9 +35,11 @@ select x from t2 where id = 0;
connection con2;
--error 1213
+reap;
commit;
connection con1;
+reap;
commit;
connection con2;