bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3416)

[Alfranio Correia]

#At file:///home/acorreia/workspace.oracle/repository.mysql/bzrwork/bug-57275/mysql-trunk-bugfixing/ based on revid:alfranio.correia@stripped

 3416 Alfranio Correia	2010-12-06 [merge]
      merge mysql-5.5-bugteam --> mysql-trunk-bugfixing

    modified:
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2010-12-02 15:05:07 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2010-12-06 12:11:46 +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-checksum=name 
  Type of BINLOG_CHECKSUM_ALG. Include checksum for log
  events in the binary log. Possible values are NONE and
@@ -83,6 +83,11 @@ The following options may be given as th
  FULL).
  --binlog-rows-query-log-events 
  Allow writing of Rows_query_log events into binary log.
+ --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
@@ -288,14 +293,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
@@ -758,6 +764,7 @@ binlog-format STATEMENT
 binlog-row-event-max-size 1024
 binlog-row-image FULL
 binlog-rows-query-log-events FALSE
+binlog-stmt-cache-size 32768
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
 character-set-filesystem binary
@@ -836,6 +843,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
[phone]
 '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: revision is a merge).