bzr commit into mysql-6.0-falcon-team branch (kevin.lewis:2738) Bug#41521

[Kevin Lewis]

#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/ based on revid:kevin.lewis@stripped

 2738 Kevin Lewis	2009-06-18
      Bug#41521 - Change the timing a bit more so that the first insert ALWAYS gets done before the second.

    modified:
      mysql-test/suite/falcon_team/r/falcon_bug_34174.result
      mysql-test/suite/falcon_team/t/falcon_bug_34174.test
=== modified file 'mysql-test/suite/falcon_team/r/falcon_bug_34174.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_34174.result	2008-07-22 14:16:22 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_34174.result	2009-06-19 04:40:32 +0000
@@ -6,6 +6,9 @@ CREATE TABLE t1 (f1 int primary key, f2 
 # switching to default connection
 START TRANSACTION;
 INSERT INTO t1 VALUES (0,0);
+SELECT * FROM t1;
+f1	f2
+0	0
 # switching to conn1
 START TRANSACTION;
 SELECT * FROM t1;

=== modified file 'mysql-test/suite/falcon_team/t/falcon_bug_34174.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_34174.test	2009-03-19 18:13:11 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_34174.test	2009-06-19 04:40:32 +0000
@@ -28,18 +28,19 @@ connect (conn1,localhost,root,,);
 connection default;
 START TRANSACTION;
 INSERT INTO t1 VALUES (0,0);
+SELECT * FROM t1;
 
 --echo # switching to conn1
 connection conn1;
 START TRANSACTION;
 SELECT * FROM t1;
 INSERT INTO t1 VALUES (1,1);
+--real_sleep 1
 --send INSERT INTO t1 VALUES (0,3)
 
---real_sleep 3
-
 --echo # switching to default connection
 connection default;
+--real_sleep 1
 SELECT * FROM t1;
 --error ER_LOCK_DEADLOCK
 UPDATE t1 SET f1 = 1, f2 = 4;


Attachment: [text/bzr-bundle] bzr/[e-mail]