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

[Kevin Lewis]

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

 2734 Kevin Lewis	2009-06-18
      Bug#42140 - Add some sleeps and an extra select to better assure the timing between connections.

    modified:
      mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
      mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
=== modified file 'mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result	2009-02-10 13:32:02 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result	2009-06-18 19:35:15 +0000
@@ -18,6 +18,8 @@ t1_autoinc
 1
 START TRANSACTION;
 DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
 # Switch to connection conn1
 SET @conn1_uuid = UUID();
 SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;

=== modified file 'mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test	2009-02-10 13:32:02 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test	2009-06-18 19:35:15 +0000
@@ -39,6 +39,7 @@ INSERT INTO t1 (t1_uuid) VALUES (@defaul
 SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
 START TRANSACTION;
 DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
 
 --echo # Switch to connection conn1
 connection conn1;
@@ -52,6 +53,7 @@ SELECT t1_autoinc FROM t1 ORDER BY t1_au
 --echo # Switch to connection default
 connection default;
 SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+--real_sleep 1
 COMMIT;
 
 --echo # Switch to connection conn1
@@ -83,11 +85,13 @@ START TRANSACTION;
 SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
 INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
 SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+--real_sleep 1
 --send DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid)
 
 --echo # Switch to connection default
 connection default;
 SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+--real_sleep 1
 COMMIT;
 
 --echo # Switch to connection conn1


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