List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:September 20 2010 12:14pm
Subject:bzr push into mysql-next-mr-bugfixing branch (alfranio.correia:3293 to 3294)
Bug#55377
View as plain text  
 3294 Alfranio Correia	2010-09-20
      BUG#55377 max_binlog_cache_size does not work as specified
      
      Post-push fixes.

    modified:
      mysql-test/r/variables.result
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test
      mysql-test/t/variables.test
 3293 Marc Alff	2010-09-17 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/t/server_init.test
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2010-08-04 10:34:01 +0000
+++ b/mysql-test/r/variables.result	2010-09-20 12:12:36 +0000
@@ -1,5 +1,4 @@
 drop table if exists t1,t2;
-set @my_binlog_cache_size         =@@global.binlog_cache_size;
 set @my_connect_timeout           =@@global.connect_timeout;
 set @my_delayed_insert_timeout    =@@global.delayed_insert_timeout;
 set @my_delayed_queue_size        =@@global.delayed_queue_size;
@@ -7,6 +6,7 @@ set @my_flush                     =@@glo
 set @my_flush_time                =@@global.flush_time;
 set @my_key_buffer_size           =@@global.key_buffer_size;
 set @my_max_binlog_cache_size     =@@global.max_binlog_cache_size;
+set @my_binlog_cache_size         =@@global.binlog_cache_size;
 set @my_max_binlog_size           =@@global.max_binlog_size;
 set @my_max_connect_errors        =@@global.max_connect_errors;
 set @my_max_connections           =@@global.max_connections;
@@ -1035,7 +1035,6 @@ Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
 set @save_join_buffer_size=@@join_buffer_size;
 set join_buffer_size=@save_join_buffer_size;
-set global binlog_cache_size         =@my_binlog_cache_size;
 set global connect_timeout           =@my_connect_timeout;
 set global delayed_insert_timeout    =@my_delayed_insert_timeout;
 set global delayed_queue_size        =@my_delayed_queue_size;
@@ -1043,6 +1042,7 @@ set global flush                     =@m
 set global flush_time                =@my_flush_time;
 set global key_buffer_size           =@my_key_buffer_size;
 set global max_binlog_cache_size     =@my_max_binlog_cache_size;
+set global binlog_cache_size         =@my_binlog_cache_size;
 set global max_binlog_size           =@my_max_binlog_size;
 set global max_connect_errors        =@my_max_connect_errors;
 set global max_connections           =@my_max_connections;

=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result	2010-09-20 12:12:36 +0000
@@ -1,17 +1,22 @@
-SET @start_value = @@global.max_binlog_cache_size;
-SELECT @start_value;
-@start_value
+SET @start_max_binlog_cache_size = @@global.max_binlog_cache_size;
+SELECT @start_max_binlog_cache_size;
+@start_max_binlog_cache_size
 18446744073709547520
+SET @start_binlog_cache_size = @@global.binlog_cache_size;
+SELECT @start_binlog_cache_size;
+@start_binlog_cache_size
+32768
 '#--------------------FN_DYNVARS_072_01------------------------#'
 SET @@global.max_binlog_cache_size = 5000;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '5000'
+Warning	1709	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET @@global.max_binlog_cache_size = DEFAULT;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
 18446744073709547520
 '#---------------------FN_DYNVARS_072_02-------------------------#'
-SET @@global.max_binlog_cache_size = @start_value;
+SET @@global.max_binlog_cache_size = @start_max_binlog_cache_size;
 SELECT @@global.max_binlog_cache_size = 4294967295;
 @@global.max_binlog_cache_size = 4294967295
 0
@@ -146,7 +151,11 @@ SELECT global.max_binlog_cache_size;
 ERROR 42S02: Unknown table 'global' in field list
 SELECT max_binlog_cache_size = @@session.max_binlog_cache_size;
 ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list'
-SET @@global.max_binlog_cache_size = @start_value;
+SET @@global.max_binlog_cache_size = @start_max_binlog_cache_size;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
 18446744073709547520
+SET @@global.binlog_cache_size= @start_binlog_cache_size;
+SELECT @@global.binlog_cache_size;
+@@global.binlog_cache_size
+32768

=== modified file 'mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test	2010-09-20 12:12:36 +0000
@@ -35,10 +35,14 @@
 
 ######################################################################## 
 # Saving initial value of max_binlog_cache_size in a temporary variable#
+# We also save binlog_cache_size because its value cannot be greater   #
+# than max_binlog_cache_size. (BUG#55377)                              #
 ######################################################################## 
 
-SET @start_value = @@global.max_binlog_cache_size;
-SELECT @start_value;
+SET @start_max_binlog_cache_size = @@global.max_binlog_cache_size;
+SELECT @start_max_binlog_cache_size;
+SET @start_binlog_cache_size = @@global.binlog_cache_size;
+SELECT @start_binlog_cache_size;
 
 
 --echo '#--------------------FN_DYNVARS_072_01------------------------#'
@@ -56,7 +60,7 @@ SELECT @@global.max_binlog_cache_size;
 #     Verify default value of variable        #
 ############################################### 
 
-SET @@global.max_binlog_cache_size = @start_value;
+SET @@global.max_binlog_cache_size = @start_max_binlog_cache_size;
 SELECT @@global.max_binlog_cache_size = 4294967295;
 
 --echo '#--------------------FN_DYNVARS_072_03------------------------#'
@@ -174,8 +178,10 @@ SELECT max_binlog_cache_size = @@session
 #   Restore initial value    #
 ##############################
 
-SET @@global.max_binlog_cache_size = @start_value;
+SET @@global.max_binlog_cache_size = @start_max_binlog_cache_size;
 SELECT @@global.max_binlog_cache_size;
+SET @@global.binlog_cache_size= @start_binlog_cache_size;
+SELECT @@global.binlog_cache_size;
 
 
 ######################################################################## 

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2010-07-27 15:01:56 +0000
+++ b/mysql-test/t/variables.test	2010-09-20 12:12:36 +0000
@@ -8,7 +8,6 @@ drop table if exists t1,t2;
 #
 # Bug#19263: variables.test doesn't clean up after itself (I/II -- save)
 #
-set @my_binlog_cache_size         =@@global.binlog_cache_size;
 set @my_connect_timeout           =@@global.connect_timeout;
 set @my_delayed_insert_timeout    =@@global.delayed_insert_timeout;
 set @my_delayed_queue_size        =@@global.delayed_queue_size;
@@ -16,6 +15,7 @@ set @my_flush                     =@@glo
 set @my_flush_time                =@@global.flush_time;
 set @my_key_buffer_size           =@@global.key_buffer_size;
 set @my_max_binlog_cache_size     =@@global.max_binlog_cache_size;
+set @my_binlog_cache_size         =@@global.binlog_cache_size;
 set @my_max_binlog_size           =@@global.max_binlog_size;
 set @my_max_connect_errors        =@@global.max_connect_errors;
 set @my_max_connections           =@@global.max_connections;
@@ -806,7 +806,6 @@ set join_buffer_size=@save_join_buffer_s
 # Bug #19263: variables.test doesn't clean up after itself (II/II --
 # restore)
 #
-set global binlog_cache_size         =@my_binlog_cache_size;
 set global connect_timeout           =@my_connect_timeout;
 set global delayed_insert_timeout    =@my_delayed_insert_timeout;
 set global delayed_queue_size        =@my_delayed_queue_size;
@@ -814,6 +813,7 @@ set global flush                     =@m
 set global flush_time                =@my_flush_time;
 set global key_buffer_size           =@my_key_buffer_size;
 set global max_binlog_cache_size     =@my_max_binlog_cache_size;
+set global binlog_cache_size         =@my_binlog_cache_size;
 set global max_binlog_size           =@my_max_binlog_size;
 set global max_connect_errors        =@my_max_connect_errors;
 set global max_connections           =@my_max_connections;


Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20100920121236-sxo39h0p2dc47omn.bundle
Thread
bzr push into mysql-next-mr-bugfixing branch (alfranio.correia:3293 to 3294)Bug#55377Alfranio Correia20 Sep