From: Mattias Jonsson
Date: April 26 2011 10:07am
Subject: bzr commit into mysql-5.1 branch (mattias.jonsson:3671)
List-Archive: http://lists.mysql.com/commits/136089
Message-Id: <201104261007.p3QA7G5o002031@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///C:/ade/mysql-bzr/topush-5.1/ based on revid:mattias.jonsson@stripped

 3671 Mattias Jonsson	2011-04-26 [merge]
      merge

    modified:
      mysql-test/suite/binlog/r/binlog_bug23533.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
=== modified file 'mysql-test/suite/binlog/r/binlog_bug23533.result'
--- a/mysql-test/suite/binlog/r/binlog_bug23533.result	2011-04-18 19:59:15 +0000
+++ b/mysql-test/suite/binlog/r/binlog_bug23533.result	2011-04-25 19:49:56 +0000
@@ -3,8 +3,6 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INC
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 1000
-SET @saved_binlog_cache_size=@@binlog_cache_size;
-SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
 SET GLOBAL binlog_cache_size=4096;
 SET GLOBAL max_binlog_cache_size=4096;
 START TRANSACTION;
@@ -14,6 +12,4 @@ COMMIT;
 SHOW TABLES LIKE 't%';
 Tables_in_test (t%)
 t1
-SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
-SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/binlog/t/binlog_bug23533.test'
--- a/mysql-test/suite/binlog/t/binlog_bug23533.test	2011-04-18 19:59:15 +0000
+++ b/mysql-test/suite/binlog/t/binlog_bug23533.test	2011-04-25 19:49:56 +0000
@@ -24,11 +24,15 @@ while ($i)
 SELECT COUNT(*) FROM t1;
 
 # Set small value for max_binlog_cache_size
-SET @saved_binlog_cache_size=@@binlog_cache_size;
-SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+let $saved_binlog_cache_size= query_get_value(SELECT @@binlog_cache_size AS Value, Value, 1);
+let $saved_max_binlog_cache_size= query_get_value(SELECT @@max_binlog_cache_size AS Value, Value, 1);
 SET GLOBAL binlog_cache_size=4096;
 SET GLOBAL max_binlog_cache_size=4096;
 
+# New value of max_binlog_cache_size will apply to new session
+disconnect default;
+connect(default,localhost,root,,test);
+
 # Copied data from t1 into t2 large than max_binlog_cache_size
 START TRANSACTION;
 --error 1197
@@ -37,6 +41,10 @@ COMMIT;
 SHOW TABLES LIKE 't%';
 
 # 5.1 End of Test
-SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
-SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
+--disable_query_log
+eval SET GLOBAL max_binlog_cache_size=$saved_max_binlog_cache_size;
+eval SET GLOBAL binlog_cache_size=$saved_binlog_cache_size;
+--enable_query_log
 DROP TABLE t1;
+disconnect default;
+connect(default,localhost,root,,test);

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).