bzr push into mysql-5.6-wl6494 branch (marko.makela:4304 to 4305) WL#6494

[marko.makela]

 4305 Marko Mäkelä	2012-09-21
      WL#6494: Make innodb_log_file_size=48M the new default.
      
      mysql-test-run: Explicitly specify the old default innodb_log_file_size=5M.
      This can be overridden by --mysqld=--innodb-log-file-size=48M.

    modified:
      mysql-test/mysql-test-run.pl
      storage/innobase/handler/ha_innodb.cc
 4304 Marko Mäkelä	2012-09-21
      WL#6494: Replace redo logs when needed.
      
      fil_close_log_files(): Close all redo log files.
      Forked from fil_close_all_files().
      
      innobase_start_or_create_for_mysql(): Replace the redo log files
      if their current size or amount differs from the configuration.

    modified:
      storage/innobase/fil/fil0fil.cc
      storage/innobase/include/fil0fil.h
      storage/innobase/srv/srv0start.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	revid:[e-mail]-20120921064458-vznpyafuvhb6w81t
+++ b/mysql-test/mysql-test-run.pl	revid:marko.makela@stripped21073047-l0jl125105fxb2v6
@@ -3474,6 +3474,7 @@ sub mysql_install_db {
   mtr_add_arg($args, "--loose-skip-falcon");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
   mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
+  mtr_add_arg($args, "--innodb-log-file-size=5M");
   mtr_add_arg($args, "--core-file");
 
   if ( $opt_debug )

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:[e-mail]-20120921073047-l0jl125105fxb2v6
@@ -15697,7 +15697,7 @@ static MYSQL_SYSVAR_LONG(log_buffer_size
 static MYSQL_SYSVAR_LONGLONG(log_file_size, innobase_log_file_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Size of each log file in a log group.",
-  NULL, NULL, 5*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 1024*1024L);
+  NULL, NULL, 48*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 1024*1024L);
 
 static MYSQL_SYSVAR_LONG(log_files_in_group, innobase_log_files_in_group,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,

No bundle (reason: useless for push emails).