List:Commits« Previous MessageNext Message »
From:Serge Kozlov Date:April 14 2011 12:02pm
Subject:bzr push into mysql-5.5 branch (Serge.Kozlov:3446 to 3447)
View as plain text  
 3447 Serge Kozlov	2011-04-14 [merge]
      autocommit 5.1 -> 5.5

    modified:
      mysql-test/suite/binlog/r/binlog_bug23533.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
 3446 Sergey Glukhov	2011-04-14 [merge]
      automerge
     @ mysql-test/r/xa.result
        automerge
     @ mysql-test/t/xa.test
        automerge
     @ sql/transaction.cc
        automerge

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
      sql/transaction.cc
=== modified file 'mysql-test/suite/binlog/r/binlog_bug23533.result'
--- a/mysql-test/suite/binlog/r/binlog_bug23533.result	2011-04-13 20:18:08 +0000
+++ b/mysql-test/suite/binlog/r/binlog_bug23533.result	2011-04-14 11:24:11 +0000
@@ -3,9 +3,6 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INC
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 1000
-SHOW VARIABLES LIKE 'max_binlog_cache_size';
-Variable_name	Value
-max_binlog_cache_size	4294963200
 SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
 SET GLOBAL max_binlog_cache_size=4096;
 START TRANSACTION;

=== modified file 'mysql-test/suite/binlog/t/binlog_bug23533.test'
--- a/mysql-test/suite/binlog/t/binlog_bug23533.test	2011-04-13 20:18:08 +0000
+++ b/mysql-test/suite/binlog/t/binlog_bug23533.test	2011-04-14 11:24:11 +0000
@@ -22,7 +22,6 @@ while ($i)
 SELECT COUNT(*) FROM t1;
 
 # Set small value for max_binlog_cache_size
-SHOW VARIABLES LIKE 'max_binlog_cache_size';
 SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
 SET GLOBAL max_binlog_cache_size=4096;
 


Attachment: [text/bzr-bundle] bzr/serge.kozlov@oracle.com-20110414115448-vcx60wwq2b1uj1oe.bundle
Thread
bzr push into mysql-5.5 branch (Serge.Kozlov:3446 to 3447) Serge Kozlov14 Apr