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

[marko.makela]

 4321 Marko Mäkelä	2012-09-25
      Suppress a warning that is sometimes issued about crash recovery.

    modified:
      mysql-test/suite/parts/r/partition_debug.result
      mysql-test/suite/parts/t/partition_debug.test
 4320 Marko Mäkelä	2012-09-25
      Make the test work with non-default innodb-page-size.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
 4319 Marko Mäkelä	2012-09-25
      Suppress warnings about resizing the InnoDB redo log.

    modified:
      mysql-test/r/mysql_plugin.result
      mysql-test/t/mysql_plugin.test
 4318 Marko Mäkelä	2012-09-25
      Correct a typo in a comment.

    modified:
      storage/innobase/srv/srv0start.cc
=== modified file 'mysql-test/r/mysql_plugin.result'
--- a/mysql-test/r/mysql_plugin.result	revid:marko.makela@stripped
+++ b/mysql-test/r/mysql_plugin.result	revid:[e-mail]-20120925124148-vfos3ynvidyok2m8
@@ -1,3 +1,6 @@
+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');
 #
 # Ensure the plugin isn't loaded.
 #

=== modified file 'mysql-test/suite/innodb/t/innodb-log-file-size.test'
--- a/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@stripped925084219-m78f7i2qtb7iouvt
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@stripped-20120925124148-vfos3ynvidyok2m8
@@ -82,7 +82,7 @@ let SEARCH_PATTERN= InnoDB: Starting an
 --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\*320 to 2\*320 pages;
+let SEARCH_PATTERN= InnoDB: Resizing redo log from 3(\*[0-9]+0) to 2\1 pages;
 --source include/search_pattern_in_file.inc
 --list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
@@ -91,7 +91,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\*320 to 2\*320 pages;
+let SEARCH_PATTERN= InnoDB: Resizing redo log from 3(\*[0-9]+0) to 2\1 pages;
 --source include/search_pattern_in_file.inc
 --list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
@@ -100,7 +100,7 @@ let SEARCH_PATTERN= InnoDB: Resizing red
 --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\*320 to 2\*320 pages;
+let SEARCH_PATTERN= InnoDB: Resizing redo log from 3(\*[0-9]+0) to 2\1 pages;
 --source include/search_pattern_in_file.inc
 --list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE

=== modified file 'mysql-test/suite/parts/r/partition_debug.result'
--- a/mysql-test/suite/parts/r/partition_debug.result	revid:marko.makela@strippedvt
+++ b/mysql-test/suite/parts/r/partition_debug.result	revid:marko.makela@strippedk2m8
@@ -3,6 +3,7 @@ DROP TABLE IF EXISTS t1;
 # WL#4445: EXCHANGE PARTITION WITH TABLE
 # Verify ddl_log in case of crashing.
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
+call mtr.add_suppression('InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles!');
 SET SESSION debug="+d,exchange_partition_abort_1";
 CREATE TABLE t2 (a INT, b VARCHAR(64));
 INSERT INTO t2 VALUES (5, "Original from table t2"), (6, "Original from table t2"), (7, "Original from table t2"), (8, "Original from table t2");

=== modified file 'mysql-test/suite/parts/t/partition_debug.test'
--- a/mysql-test/suite/parts/t/partition_debug.test	revid:marko.makela@stripped7i2qtb7iouvt
+++ b/mysql-test/suite/parts/t/partition_debug.test	revid:marko.makela@stripped3ynvidyok2m8
@@ -18,6 +18,7 @@ DROP TABLE IF EXISTS t1;
 --echo # WL#4445: EXCHANGE PARTITION WITH TABLE
 --echo # Verify ddl_log in case of crashing.
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
+call mtr.add_suppression('InnoDB: The log sequence numbers [0-9]+ and [0-9]+ in ibdata files do not match the log sequence number [0-9]+ in the ib_logfiles!');
 
 let $create_statement= CREATE TABLE t1 (a INT, b VARCHAR(64)) PARTITION BY RANGE (a)
 (PARTITION p0 VALUES LESS THAN (10),

=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	revid:marko.makela@stripped7iouvt
+++ b/mysql-test/t/mysql_plugin.test	revid:marko.makela@stripped
@@ -23,6 +23,10 @@
 --source include/not_embedded.inc
 --source include/have_innodb_16k.inc
 
+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');
+
 # Add the datadir, basedir, plugin_dir to the bootstrap command
 let $MYSQLD_DATADIR= `select @@datadir`;
 let $MYSQL_BASEDIR= `select @@basedir`;

No bundle (reason: useless for push emails).