Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/mysql-4.1

2 files changed, 12 insertions, 7 deletions

diff --git a/mysql-test/r/bdb-deadlock.result b/mysql-test/r/bdb-deadlock.result
index 55b3d3ea2a5..74798a34a53 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 b32b50c715b..27fcb5c6149 100644
--- a/mysql-test/t/bdb-deadlock.test
+++ b/mysql-test/t/bdb-deadlock.test
@@ -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;
-commit;
 
 connection con2;
-reap;
+--error 1213
+commit;
+
+connection con1;
 commit;
+
+connection con2;
 select * from t1;
 select * from t2;
 commit;
@@ -45,4 +49,5 @@ connection con1;
 select * from t1;
 select * from t2;
 commit;
+
 drop table t1,t2;