From: Date: August 27 2008 11:59pm
Subject: bzr push into mysql-6.0 branch (mats:2677 to 2678) Bug#39073
List-Archive: http://lists.mysql.com/commits/52789
X-Bug: 39073
Message-Id: <20080827215937.1338E5BFFD@mats-laptop>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2678 Mats Kindahl	2008-08-27
      Bug #39073: falcon_bug_34164 fails due to a mistyped mysqltest command
modified:
  mysql-test/suite/falcon/t/falcon_bug_34164.test

 2677 Sven Sandberg	2008-08-27 [merge]
      merge of 6.0-rpl into (local merge of 6.0-rpl into 6.0)
      all changes automerged, no conflicts
modified:
  client/mysqltest.cc
  mysql-test/mysql-test-run.pl
  sql/sql_class.h

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_34164.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_34164.test	2008-03-30 13:57:32 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_34164.test	2008-08-27 21:57:12 +0000
@@ -55,7 +55,7 @@ SELECT * FROM t1;
 --send UPDATE t1 SET b = 111 WHERE a = 1
 --echo # Switch to conn1
 connection conn1;
---real_sleep=1
+--real_sleep 1
 COMMIT;
 --echo # Switch to conn2
 connection conn2;
@@ -85,7 +85,7 @@ SELECT * FROM t1;
 --send UPDATE t1 SET b = 222 WHERE a = 2
 --echo # Switch to conn1
 connection conn1;
---real_sleep=1
+--real_sleep 1
 COMMIT;
 --echo # Switch to conn2
 connection conn2;
@@ -124,7 +124,7 @@ SELECT * FROM t1;
 --send UPDATE t1 SET b = 333 WHERE a = 3
 --echo # Switch to conn3
 connection conn3;
---real_sleep=1
+--real_sleep 1
 COMMIT;
 --echo # Switch to conn4
 connection conn4;
@@ -155,7 +155,7 @@ SELECT * FROM t1;
 --send UPDATE t1 SET b = 444 WHERE a = 4
 --echo # Switch to conn3
 connection conn3;
---real_sleep=1
+--real_sleep 1
 COMMIT;
 --echo # Switch to conn4
 connection conn4;