bzr push into mysql-5.6-wl6494 branch (vinay.fisrekar:4344 to 4345)

[Vinay Fisrekar]

 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
 4344 Marko Mäkelä	2012-09-28
      WL#6494 Windows text fix: Remove --list_files,
      because Windows may show an extra file kl-Vista32.err
      (from mysql-test-run bootstrap, according to Kevin Lewis).

    modified:
      mysql-test/suite/innodb/r/innodb-log-file-size.result
      mysql-test/suite/innodb/t/innodb-log-file-size.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-27 07:06:11 +0000
+++ b/mysql-test/suite/innodb/r/innodb-log-file-size-1.result	2012-09-28 07:34:32 +0000
@@ -12,7 +12,10 @@ SELECT @@innodb_file_format;
 Barracuda
 SELECT @@innodb_log_file_size;
 @@innodb_log_file_size
-5242880
+1048576
+SELECT @@innodb_log_files_in_group;
+@@innodb_log_files_in_group
+2
 DROP DATABASE IF EXISTS db_wl6494;
 CREATE DATABASE db_wl6494;
 USE db_wl6494;
@@ -47,11 +50,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 
+The size of the ib_logfile0 file: 2 
+The size of the ib_logfile1 file: 2 
+The size of the ib_logfile2 file: 2 
+The size of the ib_logfile3 file: 2 
+The size of the ib_logfile4 file: 2 
 USE db_wl6494;
 SELECT id,LEFT(bfield,20) FROM t1;
 id	LEFT(bfield,20)
@@ -79,6 +82,12 @@ id	LEFT(bfield,20)
 23	cccccccccccccccccccc
 DROP TABLE t1;
 DROP DATABASE db_wl6494;
+SELECT @@innodb_log_file_size;
+@@innodb_log_file_size
+3145728
+SELECT @@innodb_log_files_in_group;
+@@innodb_log_files_in_group
+3
 DROP DATABASE IF EXISTS db_wl6494;
 CREATE DATABASE db_wl6494;
 USE db_wl6494;
@@ -113,6 +122,12 @@ id	LEFT(bfield,20)
 11	aaaaaaaaaaaaaaaaaaaa
 12	bbbbbbbbbbbbbbbbbbbb
 13	cccccccccccccccccccc
+SELECT @@innodb_log_file_size;
+@@innodb_log_file_size
+2097152
+SELECT @@innodb_log_files_in_group;
+@@innodb_log_files_in_group
+2
 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-27 21:20:33 +0000
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	2012-09-28 07:34:32 +0000
@@ -25,7 +25,7 @@
 # Do something while server is down
 --enable_reconnect
 # Write file to make mysql-test-run.pl start up the server again
---exec echo "restart: --innodb-fast-shutdown=2 " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--exec echo "restart: --innodb-fast-shutdown=2 --innodb-log-file-size=1M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --source include/wait_until_connected_again.inc
 
 
@@ -46,6 +46,7 @@ SET GLOBAL innodb_file_format = `Barracu
 SELECT @@innodb_file_format;
 
 SELECT @@innodb_log_file_size;
+SELECT @@innodb_log_files_in_group;
 
 
 # Testcase 1 - set log file size > existing size and innodb_log_files_in_group > old value
@@ -77,8 +78,8 @@ 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 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
+# set log size from 2*1M to 5*2M
+--exec echo "restart: --innodb-log-file-size=2M --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/case1.err;
@@ -127,10 +128,12 @@ 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 15M
---exec echo "restart: --innodb-fast-shutdown=2 --innodb-log-file-size=15M" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# set log size to 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
 
+SELECT @@innodb_log_file_size;
+SELECT @@innodb_log_files_in_group;
 
 # Testcase 2 - set log file size < existing size and innodb_log_files_in_group < old value
 --disable_warnings
@@ -161,14 +164,19 @@ 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*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
+# set log size from 2*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
 
+SELECT @@innodb_log_file_size;
+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;
 --source include/search_pattern_in_file.inc
 
+
 USE db_wl6494;
 SELECT id,LEFT(bfield,20) FROM t1;
 --ERROR ER_DUP_ENTRY

No bundle (reason: useless for push emails).