From: Date: June 14 2008 3:28pm
Subject: bzr push into mysql-6.0-falcon branch (hakan:2700) Bug#37078
List-Archive: http://lists.mysql.com/commits/47871
X-Bug: 37078
Message-Id: <20080614132807.D847F12388D@lu0011.efendi.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2700 Hakan Kuecuekyilmaz	2008-06-14
      Fixed test case falcon_bug_26828.test. This fixes Bug#37078.
modified:
  mysql-test/suite/falcon/r/falcon_bug_26828.result
  mysql-test/suite/falcon/t/falcon_bug_26828.test

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_26828.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_26828.result	2007-09-20 15:44:25 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_26828.result	2008-06-14 12:41:25 +0000
@@ -1,6 +1,8 @@
 SET @@storage_engine = Falcon;
 *** Bug #26828 ***
 DROP SCHEMA IF EXISTS db1;
+SELECT @@GLOBAL.falcon_consistent_read INTO @previous_falcon_consistent_read;
+SET GLOBAL falcon_consistent_read = off;
 CREATE SCHEMA db1;
 USE db1;
 CREATE TABLE t1 (a int)
@@ -27,6 +29,7 @@ CALL p1();
 # Switch to connection conn1
 CALL p1();
 # Switch to connection default
+SET GLOBAL falcon_consistent_read = @previous_falcon_consistent_read;
 DROP TABLE t1;
 DROP SCHEMA db1;
 USE test;

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_26828.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_26828.test	2007-12-19 18:55:35 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_26828.test	2008-06-14 12:41:25 +0000
@@ -10,6 +10,9 @@ SET @@storage_engine = Falcon;
 DROP SCHEMA IF EXISTS db1;
 --enable_warnings
 
+SELECT @@GLOBAL.falcon_consistent_read INTO @previous_falcon_consistent_read;
+SET GLOBAL falcon_consistent_read = off;
+
 CREATE SCHEMA db1;
 USE db1;
 CREATE TABLE t1 (a int)
@@ -48,6 +51,7 @@ CALL p1();
 --echo # Switch to connection default
 connection default;
 disconnect conn1;
+SET GLOBAL falcon_consistent_read = @previous_falcon_consistent_read;
 DROP TABLE t1;
 DROP SCHEMA db1;
 USE test;