bzr push into mysql-5.6-wl6494 branch (vinay.fisrekar:4339 to 4340)

[Vinay Fisrekar]

 4340 Vinay Fisrekar	2012-09-28
      Test fix to correct testcase 2 (set new size < old size). 

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
 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
=== 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-27 15:49:16 +0000
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	2012-09-27 19:10:21 +0000
@@ -77,7 +77,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 5M to 10M
+# set log size from 2*5M to 5*10M
 --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
 
@@ -127,8 +127,8 @@ 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 from 5M to 10M
---exec echo "restart: --innodb-fast-shutdown=2" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# set log size to 15M
+--exec echo "restart: --innodb-fast-shutdown=2 --innodb-log-file-size=15M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
 
@@ -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 2*5M to 2*10M
+# set log size from 2*15M 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
 

No bundle (reason: useless for push emails).