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

[marko.makela]

 4347 Marko Mäkelä	2012-09-28
      WL#6494 test case fix: Suppress gcov failure, skip test with 2M log size.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
 4346 Marko Mäkelä	2012-09-28
      WL#6494: Make the test independent of default innodb-log-file-size.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
 4345 Vinay Fisrekar	2012-09-28
      Use small values for innodb_log_file_size 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
=== 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@stripped
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	revid:marko.makela@stripped
@@ -18,9 +18,13 @@
 # Valgrind would complain about memory leaks when we crash on purpose.
 --source include/not_valgrind.inc
 
+if (`SELECT @@innodb_log_file_size = 2097152`) {
+  --skip Test requires innodb_log_file_size!=2M.
+}
+
 # restart with innodb-fast-shutdown=2 to on stopping it , behave as crash
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server 
+--shutdown_server
 --source include/wait_until_disconnected.inc
 # Do something while server is down
 --enable_reconnect
@@ -83,10 +87,10 @@ SELECT id,LEFT(bfield,20) FROM t1;
 --source include/wait_until_connected_again.inc
 
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/case1.err;
-let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
+let SEARCH_PATTERN= InnoDB: Starting crash recovery;
 --source include/search_pattern_in_file.inc
 
-# Check size of ib_logfile* when innodb_log_files_in_group is set 
+# Check size of ib_logfile* when innodb_log_files_in_group is set
 perl;
  my $dir = $ENV{'MYSQLD_DATADIR'};
  $file = "ib_logfile0";
@@ -128,7 +132,7 @@ DROP DATABASE db_wl6494;
 --move_file $SEARCH_FILE $MYSQLTEST_VARDIR/log/mysqld.1.err.old1
 --enable_reconnect
 # Write file to make mysql-test-run.pl start up the server again
-# set log size to 3M
+# set log size to 3*3M
 --exec echo "restart: --innodb-fast-shutdown=2 --innodb-log-file-size=3M --innodb_log_files_in_group=3" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
@@ -164,7 +168,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 2*3M to 2*2M
+# set log size from 3*3M to 2*2M
 --exec echo "restart: --innodb-log-file-size=2M --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
 
@@ -173,7 +177,7 @@ SELECT @@innodb_log_files_in_group;
 
 
 let SEARCH_FILE= $MYSQLTEST_VARDIR/log/case2.err;
-let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
+let SEARCH_PATTERN= InnoDB: Starting crash recovery;
 --source include/search_pattern_in_file.inc
 
 

=== modified file 'mysql-test/suite/innodb/t/innodb-log-file-size.test'
--- a/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:vinay.fisrekar@stripped8073432-ni3m33pch51r9tu4
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@stripped0120928104428-57lu6em4v256jb23
@@ -10,6 +10,10 @@
 # Avoid CrashReporter popup on Mac
 --source include/not_crashrep.inc
 
+if (`SELECT @@innodb_log_file_size = 1048576`) {
+  --skip Test requires innodb_log_file_size>1M.
+}
+
 call mtr.add_suppression("InnoDB: Resizing redo log");
 call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files");
 call mtr.add_suppression("InnoDB: New log files created");
@@ -99,7 +103,7 @@ let SEARCH_PATTERN= InnoDB: Can.t initia
 --exec $MYSQLD_CMD $crash=4
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Resizing redo log from 3(\*[0-9]+0) to 2\1 pages;
+let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=5
@@ -107,7 +111,7 @@ let SEARCH_PATTERN= InnoDB: Resizing red
 --exec $MYSQLD_CMD $crash=5
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Resizing redo log from 3(\*[0-9]+0) to 2\1 pages;
+let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 
@@ -122,7 +126,7 @@ let SEARCH_PATTERN= InnoDB: Can.t initia
 --exec $MYSQLD_CMD $crash=6
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Resizing redo log from 3(\*[0-9]+0) to 2\1 pages;
+let SEARCH_PATTERN= InnoDB: Resizing redo log from 3\*[0-9]+ to 2\*[0-9]+ pages;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=7
@@ -140,13 +144,13 @@ let SEARCH_PATTERN= InnoDB: Cannot creat
 --echo --innodb-force-recovery-crash=8
 --error 3,137
 --exec $MYSQLD_CMD $crash=8
-let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to 5 MB;
+let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=9
 --error 3,137
 --exec $MYSQLD_CMD $crash=9
-let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to 5 MB;
+let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 
@@ -182,7 +186,7 @@ EOF
 
 --error 1
 --exec $MYSQLD_CMD $args
-let SEARCH_PATTERN= InnoDB: Log file .*ib_logfile1 is of different size 1048576 bytes than other log files 5242880 bytes!;
+let SEARCH_PATTERN= InnoDB: Log file .*ib_logfile1 is of different size 1048576 bytes than other log files;
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 --remove_file $MYSQLD_DATADIR/ib_logfile1
@@ -192,7 +196,7 @@ let SEARCH_PATTERN= InnoDB: Log file .*i
 --echo --innodb-force-recovery-crash=10
 --error 3,137
 --exec $MYSQLD_CMD $crash=10
-let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to 5 MB;
+let SEARCH_PATTERN= InnoDB: Setting log file .*ib_logfile[0-9]+ size to;
 --source include/search_pattern_in_file.inc
 let SEARCH_PATTERN= InnoDB: Renaming log file .*ib_logfile101 to .*ib_logfile0;
 --source include/search_pattern_in_file.inc

No bundle (reason: useless for push emails).