bzr push into mysql-5.6-wl6494 branch (marko.makela:4315 to 4318)

[marko.makela]

 4318 Marko Mäkelä	2012-09-25
      Correct a typo in a comment.

    modified:
      storage/innobase/srv/srv0start.cc
 4317 Marko Mäkelä	2012-09-25
      WL#6494 clean-up suggested in code review
      
      innobase_log_files_in_group: Remove. Bind srv_n_log_files directly
      to the parameter innodb_log_files_in_group.
      
      SRV_N_LOG_FILES_MAX: The maximum value of innobase_log_files_in_group.

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/srv0srv.h
      storage/innobase/srv/srv0srv.cc
      storage/innobase/srv/srv0start.cc
 4316 Marko Mäkelä	2012-09-25
      WL#6494 cleanup: Remove a bogus recommendation
      in the help message of innodb_log_files_in_group.

    modified:
      storage/innobase/handler/ha_innodb.cc
 4315 Marko Mäkelä	2012-09-25
      WL#6494 testing: Check the server error log messages.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:[e-mail]-20120925081220-bpxpzyviwfzpdyx7
+++ b/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped20120925084219-m78f7i2qtb7iouvt
@@ -121,7 +121,6 @@ static const long AUTOINC_NEW_STYLE_LOCK
 static const long AUTOINC_NO_LOCKING = 2;
 
 static long innobase_mirrored_log_groups;
-static long innobase_log_files_in_group;
 static long innobase_log_buffer_size;
 static long innobase_additional_mem_pool_size;
 static long innobase_file_io_threads;
@@ -3071,7 +3070,6 @@ innobase_change_buffering_inited_ok:
 
 	srv_file_flush_method_str = innobase_file_flush_method;
 
-	srv_n_log_files = (ulint) innobase_log_files_in_group;
 	srv_log_file_size = (ib_uint64_t) innobase_log_file_size;
 
 #ifdef UNIV_LOG_ARCHIVE
@@ -15703,10 +15701,10 @@ static MYSQL_SYSVAR_LONGLONG(log_file_si
   "Size of each log file in a log group.",
   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,
+static MYSQL_SYSVAR_ULONG(log_files_in_group, srv_n_log_files,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here.",
-  NULL, NULL, 2, 2, 100, 0);
+  "Number of log files in the log group. InnoDB writes to the files in a circular fashion.",
+  NULL, NULL, 2, 2, SRV_N_LOG_FILES_MAX, 0);
 
 static MYSQL_SYSVAR_LONG(mirrored_log_groups, innobase_mirrored_log_groups,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,

=== modified file 'storage/innobase/include/srv0srv.h'
--- a/storage/innobase/include/srv0srv.h	revid:marko.makela@stripped220-bpxpzyviwfzpdyx7
+++ b/storage/innobase/include/srv0srv.h	revid:marko.makela@strippedqtb7iouvt
@@ -243,7 +243,9 @@ extern ulong	srv_auto_extend_increment;
 
 extern ibool	srv_created_new_raw;
 
-extern ulint	srv_n_log_files;
+/** Maximum number of srv_n_log_files, or innodb_log_files_in_group */
+#define SRV_N_LOG_FILES_MAX 100
+extern ulong	srv_n_log_files;
 extern ib_uint64_t	srv_log_file_size;
 extern ib_uint64_t	srv_log_file_size_requested;
 extern ulint	srv_log_buffer_size;

=== modified file 'storage/innobase/srv/srv0srv.cc'
--- a/storage/innobase/srv/srv0srv.cc	revid:[e-mail]-20120925081220-bpxpzyviwfzpdyx7
+++ b/storage/innobase/srv/srv0srv.cc	revid:marko.makela@stripped5084219-m78f7i2qtb7iouvt
@@ -178,7 +178,7 @@ UNIV_INTERN ibool	srv_created_new_raw	=
 
 UNIV_INTERN char*	srv_log_group_home_dir	= NULL;
 
-UNIV_INTERN ulint	srv_n_log_files		= ULINT_MAX;
+UNIV_INTERN ulong	srv_n_log_files		= SRV_N_LOG_FILES_MAX;
 /* size in database pages */
 UNIV_INTERN ib_uint64_t	srv_log_file_size	= IB_UINT64_MAX;
 UNIV_INTERN ib_uint64_t	srv_log_file_size_requested;

=== modified file 'storage/innobase/srv/srv0start.cc'
--- a/storage/innobase/srv/srv0start.cc	revid:marko.makela@strippedom-20120925081220-bpxpzyviwfzpdyx7
+++ b/storage/innobase/srv/srv0start.cc	revid:marko.makela@stripped84219-m78f7i2qtb7iouvt
@@ -541,7 +541,7 @@ create_log_file(
 }
 
 /** Initial number of the first redo log file */
-#define INIT_LOG_FILE0	101
+#define INIT_LOG_FILE0	(SRV_N_LOG_FILES_MAX + 1)
 
 #ifdef DBUG_OFF
 # define RECOVERY_CRASH(x) do {} while(0)
@@ -641,7 +641,7 @@ create_log_files(
 }
 
 /*********************************************************************//**
-Renames the first all log file. */
+Renames the first log file. */
 static
 void
 create_log_files_rename(
@@ -1970,7 +1970,7 @@ create_log_files:
 						max_flushed_lsn, logfile0);
 		}
 	} else {
-		for (i = 0; i < 100/* max of srv_n_log_files */; i++) {
+		for (i = 0; i < SRV_N_LOG_FILES_MAX; i++) {
 			os_offset_t	size;
 			os_file_stat_t	stat_info;
 
@@ -1982,7 +1982,8 @@ create_log_files:
 
 			if (err == DB_NOT_FOUND) {
 				if (i == 0) {
-					if (max_flushed_lsn != min_flushed_lsn) {
+					if (max_flushed_lsn
+					    != min_flushed_lsn) {
 						ib_logf(IB_LOG_LEVEL_ERROR,
 							"Cannot create"
 							" log files because"

No bundle (reason: useless for push emails).