From: Alfranio Correia Date: December 6 2010 12:26pm Subject: bzr push into mysql-5.5-bugteam branch (alfranio.correia:3167 to 3168) Bug#57275 List-Archive: http://lists.mysql.com/commits/126130 X-Bug: 57275 Message-Id: <201012061228.oB67R4qo029585@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3168 Alfranio Correia 2010-12-06 Post-push fix for BUG#57275. modified: mysql-test/r/mysqld--help-win.result mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result 3167 Alfranio Correia 2010-12-05 [merge] merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteam removed: mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt added: mysql-test/suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test renamed: mysql-test/extra/binlog_tests/innodb_stat.test => mysql-test/extra/binlog_tests/binlog_cache_stat.test mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result => mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result mysql-test/suite/binlog/r/binlog_row_innodb_stat.result => mysql-test/suite/binlog/r/binlog_row_cache_stat.result mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result => mysql-test/suite/binlog/r/binlog_stm_cache_stat.result mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test => mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test mysql-test/suite/binlog/t/binlog_row_innodb_stat.test => mysql-test/suite/binlog/t/binlog_row_cache_stat.test mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test => mysql-test/suite/binlog/t/binlog_stm_cache_stat.test modified: include/my_sys.h mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/r/mysqld--help-notwin.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result sql/log.cc sql/log.h sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/share/errmsg-utf8.txt sql/sys_vars.cc mysql-test/extra/binlog_tests/binlog_cache_stat.test mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result mysql-test/suite/binlog/r/binlog_row_cache_stat.result mysql-test/suite/binlog/r/binlog_stm_cache_stat.result mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test mysql-test/suite/binlog/t/binlog_row_cache_stat.test mysql-test/suite/binlog/t/binlog_stm_cache_stat.test === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2010-11-05 13:16:27 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2010-12-06 11:55:36 +0000 @@ -32,10 +32,10 @@ The following options may be given as th file (Solves most 'table full' errors) --bind-address=name IP address to bind to. --binlog-cache-size=# - The size of the cache to hold the SQL statements for the - binary log during a transaction. If you often use big, - multi-statement transactions you can increase this to get - more performance + The size of the transactional cache for updates to + transactional engines for the binary log. If you often + use transactions containing many statements, you can + increase this to get more performance --binlog-direct-non-transactional-updates Causes updates to non-transactional engines using statement format to be written directly to binary log. @@ -66,6 +66,11 @@ The following options may be given as th The maximum size of a row-based binary log event in bytes. Rows will be grouped into events smaller than this size if possible. The value has to be a multiple of 256. + --binlog-stmt-cache-size=# + The size of the statement cache for updates to + non-transactional engines for the binary log. If you + often use statements updating a great number of rows, you + can increase this to get more performance --bootstrap Used by mysql installation scripts. --bulk-insert-buffer-size=# Size of tree cache used in bulk insert optimisation. Note @@ -277,14 +282,15 @@ The following options may be given as th --max-allowed-packet=# Max packet length to send to or receive from the server --max-binlog-cache-size=# - Can be used to restrict the total size used to cache a - multi-transaction query + Sets the total size of the transactional cache --max-binlog-dump-events=# Option used by mysql-test for debugging and testing of replication. --max-binlog-size=# Binary log will be rotated automatically when the size exceeds this value. Will also apply to relay logs if max_relay_log_size is 0 + --max-binlog-stmt-cache-size=# + Sets the total size of the statement cache --max-connect-errors=# If there is more than this number of interrupted connections from a host this host will be blocked from @@ -738,6 +744,7 @@ binlog-cache-size 32768 binlog-direct-non-transactional-updates FALSE binlog-format STATEMENT binlog-row-event-max-size 1024 +binlog-stmt-cache-size 32768 bulk-insert-buffer-size 8388608 character-set-client-handshake TRUE character-set-filesystem binary @@ -816,6 +823,7 @@ max-allowed-packet 1048576 max-binlog-cache-size 18446744073709547520 max-binlog-dump-events 0 max-binlog-size 1073741824 +max-binlog-stmt-cache-size 18446744073709547520 max-connect-errors 10 max-connections 151 max-delayed-threads 20 === modified file 'mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result' --- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result 2010-11-05 17:42:37 +0000 +++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result 2010-12-06 11:55:36 +0000 @@ -59,7 +59,7 @@ Warnings: Warning 1292 Truncated incorrect binlog_stmt_cache_size value: '42949672950' SELECT @@global.binlog_stmt_cache_size; @@global.binlog_stmt_cache_size -4294963200 +42949668864 'Bug: Errors are not coming on assigning invalid values to variable' SET @@global.binlog_stmt_cache_size = ON; ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size' No bundle (reason: useless for push emails).