bzr push into mysql-trunk branch (tor.didriksen:3790 to 3791)

[Tor Didriksen]

 3791 Tor Didriksen	2012-01-26 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/r/mysqld--help-win.result
 3790 kevin.lewis@stripped	2012-01-25
      Bug#13623078 - Use UNIV_PAGE_SIZE instead of 16*1024 for handler::block_size.
      Approved by marko on #innodb
      Tested with 4k, 8k and 16k pages and with PB2 on mysql-trunk-innodb-pb2

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-01-25 10:07:23 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-01-26 07:01:30 +0000
@@ -805,7 +805,7 @@ The following options may be given as th
  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
  for the complete list of valid sql modes
  --standalone        Dummy option to start as a standalone program (NT).
- --stored-program-cache=#
+ --stored-program-cache=# 
  The soft upper limit for number of cached stored routines
  for one connection.
  -s, --symbolic-links 

No bundle (reason: useless for push emails).