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

[marko.makela]

 4339 Marko Mäkelä	2012-09-27
      WL#6494 test enhancement.
      
      Remove redo log files after a clean shutdown, and ensure that
      the database is accessible after a restart.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
 4338 Marko Mäkelä	2012-09-27
      WL#6494: Suppress a bogus log apply message after creating log files
      when the log files were missing.

    modified:
      storage/innobase/srv/srv0start.cc
 4337 Marko Mäkelä	2012-09-27
      WL#6494 test case failure fix.
      
      Use ib_logf() to issue a recovery message.
      For some reason, the fputs(..., stderr) was apparently lost in a gcov test.

    modified:
      storage/innobase/log/log0recv.cc
 4336 Vinay Fisrekar	2012-09-27
      Fix(marko's change) Bug#14681799 CRASH RECOVERY WARNINGS ON MAC OS X  and test failure 
      (of grep on error log and  Added size check forinnodb_log_files_in_group in test)

    modified:
      mysql-test/suite/innodb/r/innodb-log-file-size-1.result
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
      storage/innobase/log/log0recv.cc
=== modified file 'mysql-test/suite/innodb/t/innodb-log-file-size-1.test'
--- a/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	revid:vinay.fisrekar@strippedkv
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	revid:marko.makela@strippedu1k2pdhldm
@@ -161,7 +161,7 @@ SELECT id,LEFT(bfield,20) FROM t1;
 # Do something while server is down
 --enable_reconnect
 # Write file to make mysql-test-run.pl start up the server again
-# set log size from 15M to 10M
+# set log size from 2*5M to 2*10M
 --exec echo "restart: --innodb-log-file-size=10M --innodb_log_files_in_group=2  --log-error=$MYSQLTEST_VARDIR/log/case2.err" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
@@ -255,10 +255,9 @@ let SEARCH_PATTERN= InnoDB: .*ib_logfile
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --remove_file $MYSQLD_DATADIR/ib_logfile1
-#--move_file $MYSQLD_DATADIR/ib_logfile0 $MYSQLD_DATADIR/ib_logfile101
---move_file $MYSQLD_DATADIR/ib_logfile1_hidden $MYSQLD_DATADIR/ib_logfile1
+--move_file $MYSQLD_DATADIR/ib_logfile0 $MYSQLD_DATADIR/ib_logfile0_hidden
 
-# restart server 
+# restart server
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --enable_reconnect
 --source include/wait_until_connected_again.inc
@@ -269,7 +268,7 @@ SELECT id,LEFT(bfield,20) FROM t1;
 INSERT INTO t1 VALUES (1,repeat('a',2000)),(2,repeat('b',2000)),
 (3,repeat('c',2000));
 
-# cleanup and set original values 
+# cleanup and set original values
 DROP TABLE t1;
 DROP DATABASE db_wl6494;
 --error 0,1
@@ -278,6 +277,8 @@ DROP DATABASE db_wl6494;
 --remove_file $MYSQLTEST_VARDIR/log/case1.err
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/log/case2.err
+--remove_file $MYSQLD_DATADIR/ib_logfile0_hidden
+--remove_file $MYSQLD_DATADIR/ib_logfile1_hidden
 --disable_query_log
 eval SET GLOBAL INNODB_FILE_FORMAT=$innodb_file_format;
 eval SET GLOBAL INNODB_FILE_PER_TABLE=$innodb_file_per_table;

=== modified file 'storage/innobase/log/log0recv.cc'
--- a/storage/innobase/log/log0recv.cc	revid:[e-mail]-20120927070611-473jupcssj3vqmkv
+++ b/storage/innobase/log/log0recv.cc	revid:marko.makela@stripped0120927154916-5n75guu1k2pdhldm
@@ -1789,11 +1789,11 @@ loop:
 
 			if (recv_addr->state == RECV_NOT_PROCESSED) {
 				if (!has_printed) {
-					ut_print_timestamp(stderr);
-					fputs("  InnoDB: Starting an"
-					      " apply batch of log records"
-					      " to the database...\n"
-					      "InnoDB: Progress in percents: ",
+					ib_logf(IB_LOG_LEVEL_INFO,
+						"Starting an apply batch"
+						" of log records"
+						" to the database...");
+					fputs("InnoDB: Progress in percent: ",
 					      stderr);
 					has_printed = TRUE;
 				}
@@ -1906,9 +1906,10 @@ recv_apply_log_recs_for_backup(void)
 
 	block = back_block1;
 
-	fputs("InnoDB: Starting an apply batch of log records"
-	      " to the database...\n"
-	      "InnoDB: Progress in percents: ", stderr);
+	ib_logf(IB_LOG_LEVEL_INFO,
+		"Starting an apply batch of log records to the database...");
+
+	fputs("InnoDB: Progress in percent: ", stderr);
 
 	n_hash_cells = hash_get_n_cells(recv_sys->addr_hash);
 

=== modified file 'storage/innobase/srv/srv0start.cc'
--- a/storage/innobase/srv/srv0start.cc	revid:vinay.fisrekar@strippedqmkv
+++ b/storage/innobase/srv/srv0start.cc	revid:marko.makela@stripped
@@ -2054,6 +2054,10 @@ innobase_start_or_create_for_mysql(void)
 						logfilename, dirnamelen,
 						max_flushed_lsn, logfile0);
 
+					/* Suppress the message about
+					crash recovery. */
+					max_flushed_lsn = min_flushed_lsn
+						= log_get_lsn();
 					goto files_checked;
 				} else if (i < 2) {
 					/* must have at least 2 log files */
@@ -2699,7 +2703,7 @@ files_checked:
 
 	if (srv_print_verbose_log) {
 		ib_logf(IB_LOG_LEVEL_INFO,
-			"%s started; " "log sequence number " LSN_PF "",
+			"%s started; log sequence number " LSN_PF "",
 			INNODB_VERSION_STR, srv_start_lsn);
 	}
 

No bundle (reason: useless for push emails).