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

[marko.makela]

 4332 Marko Mäkelä	2012-09-26
      WL#6494: Test in read-only mode.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
 4331 Marko Mäkelä	2012-09-26
      WL#6494: Cover some error handling.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
      storage/innobase/srv/srv0start.cc
=== 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@strippedpt2lyyemp
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@strippedf1ia73pdlq3vq4d
@@ -87,6 +87,15 @@ let SEARCH_PATTERN= InnoDB: Starting an
 --source include/search_pattern_in_file.inc
 --list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
+
+--error 1
+--exec $MYSQLD_CMD $args --innodb-read-only
+let SEARCH_PATTERN= InnoDB: Recovery skipped, --innodb-read-only set!;
+--source include/search_pattern_in_file.inc
+let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-only-mode;
+--source include/search_pattern_in_file.inc
+--remove_file $SEARCH_FILE
+
 --echo --innodb-force-recovery-crash=4
 --error 137
 --exec $MYSQLD_CMD $crash=4
@@ -105,6 +114,13 @@ let SEARCH_PATTERN= InnoDB: Resizing red
 --source include/search_pattern_in_file.inc
 --list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
+
+--error 1
+--exec $MYSQLD_CMD $args --innodb-read-only
+let SEARCH_PATTERN= InnoDB: Can.t initiate database recovery, running in read-only-mode;
+--source include/search_pattern_in_file.inc
+--remove_file $SEARCH_FILE
+
 --echo --innodb-force-recovery-crash=6
 --error 137
 --exec $MYSQLD_CMD $crash=6

No bundle (reason: useless for push emails).