bzr push into mysql-5.6-wl6494 branch (vinay.fisrekar:4335 to 4336) Bug#14681799

[Vinay Fisrekar]

 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
 4335 Marko Mäkelä	2012-09-26
      WL#6494: Enable a test.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
=== modified file 'mysql-test/suite/innodb/r/innodb-log-file-size-1.result'
--- a/mysql-test/suite/innodb/r/innodb-log-file-size-1.result	2012-09-26 20:31:47 +0000
+++ b/mysql-test/suite/innodb/r/innodb-log-file-size-1.result	2012-09-27 07:06:11 +0000
@@ -47,6 +47,11 @@ id	LEFT(bfield,20)
 11	aaaaaaaaaaaaaaaaaaaa
 12	bbbbbbbbbbbbbbbbbbbb
 13	cccccccccccccccccccc
+The size of the ib_logfile0 file: 15 
+The size of the ib_logfile1 file: 15 
+The size of the ib_logfile2 file: 15 
+The size of the ib_logfile3 file: 15 
+The size of the ib_logfile4 file: 15 
 USE db_wl6494;
 SELECT id,LEFT(bfield,20) FROM t1;
 id	LEFT(bfield,20)

=== 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	2012-09-26 20:38:22 +0000
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	2012-09-27 07:06:11 +0000
@@ -78,13 +78,34 @@ SELECT id,LEFT(bfield,20) FROM t1;
 --enable_reconnect
 # Write file to make mysql-test-run.pl start up the server again
 # set log size from 5M to 10M
---exec echo "restart: --innodb-log-file-size=15M --innodb_log_files_in_group=5" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--exec echo "restart: --innodb-log-file-size=15M --innodb_log_files_in_group=5  --log-error=$MYSQLTEST_VARDIR/log/case1.err" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
-let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_FILE= $MYSQLTEST_VARDIR/log/case1.err;
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 
+# Check size of ib_logfile* when innodb_log_files_in_group is set 
+perl;
+ my $dir = $ENV{'MYSQLD_DATADIR'};
+ $file = "ib_logfile0";
+ $size_in_MB = (-s "$dir/$file") / (1024 * 1024);;
+ print "The size of the $file file: $size_in_MB \n";
+ $file = "ib_logfile1";
+ $size_in_MB = (-s "$dir/$file") / (1024 * 1024);;
+ print "The size of the $file file: $size_in_MB \n";
+ $file = "ib_logfile2";
+ $size_in_MB = (-s "$dir/$file") / (1024 * 1024);;
+ print "The size of the $file file: $size_in_MB \n";
+ $file = "ib_logfile3";
+ $size_in_MB = (-s "$dir/$file") / (1024 * 1024);;
+ print "The size of the $file file: $size_in_MB \n";
+ $file = "ib_logfile4";
+ $size_in_MB = (-s "$dir/$file") / (1024 * 1024);;
+ print "The size of the $file file: $size_in_MB \n";
+EOF
+
+
 USE db_wl6494;
 SELECT id,LEFT(bfield,20) FROM t1;
 --ERROR ER_DUP_ENTRY
@@ -141,10 +162,10 @@ SELECT id,LEFT(bfield,20) FROM t1;
 --enable_reconnect
 # Write file to make mysql-test-run.pl start up the server again
 # set log size from 15M to 10M
---exec echo "restart: --innodb-log-file-size=10M --innodb_log_files_in_group=2" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--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
 
-let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_FILE= $MYSQLTEST_VARDIR/log/case2.err;
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
 
@@ -251,7 +272,12 @@ INSERT INTO t1 VALUES (1,repeat('a',2000
 # cleanup and set original values 
 DROP TABLE t1;
 DROP DATABASE db_wl6494;
+--error 0,1
 --remove_file $MYSQLTEST_VARDIR/log/mysqld.1.err.old1
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/log/case1.err
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/log/case2.err
 --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	2012-09-25 20:57:21 +0000
+++ b/storage/innobase/log/log0recv.cc	2012-09-27 07:06:11 +0000
@@ -3154,7 +3154,7 @@ recv_recovery_from_checkpoint_start_func
 			}
 
 			if (!recv_needed_recovery) {
-				ib_logf(IB_LOG_LEVEL_WARN,
+				ib_logf(IB_LOG_LEVEL_INFO,
 					"The log sequence numbers "
 					LSN_PF " and " LSN_PF
 					" in ibdata files do not match"

No bundle (reason: useless for push emails).