List:Commits« Previous MessageNext Message »
From:marko.makela Date:September 27 2012 9:35pm
Subject:bzr push into mysql-5.6-wl6494 branch (marko.makela:4340 to 4344) WL#6494
View as plain text  
 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
 4343 Marko Mäkelä	2012-09-28
      WL#6494 Windows text fix: Avoid LF vs CR+LF issue.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size-1.test
      mysql-test/suite/innodb/t/innodb-log-file-size.test
 4342 Marko Mäkelä	2012-09-28
      WL#6494 Windows text fix: Remove SEARCH_PATTERN dependency on /
      as the path separator.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
 4341 Marko Mäkelä	2012-09-28
      WL#6494: Adapt for the DBUG_SUICIDE() exit code on Windows.

    modified:
      mysql-test/suite/innodb/t/innodb-log-file-size.test
 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
=== modified file 'mysql-test/suite/innodb/r/innodb-log-file-size.result'
--- a/mysql-test/suite/innodb/r/innodb-log-file-size.result	revid:vinay.fisrekar@stripped
+++ b/mysql-test/suite/innodb/r/innodb-log-file-size.result	revid:marko.makela@strippedlh2ynd
@@ -20,108 +20,15 @@ SET DEBUG='+d,crash_commit_before';
 DELETE FROM t1;
 ERROR HY000: Lost connection to MySQL server during query
 --innodb-force-recovery-crash=1
-auto.cnf
-ib_logfile0
-ib_logfile1
-ib_logfile2
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=2
-auto.cnf
-ib_logfile0
-ib_logfile1
-ib_logfile2
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=3
-auto.cnf
-ib_logfile0
-ib_logfile1
-ib_logfile2
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=4
-auto.cnf
-ib_logfile0
-ib_logfile1
-ib_logfile2
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=5
-auto.cnf
-ib_logfile0
-ib_logfile1
-ib_logfile2
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=6
-auto.cnf
-ib_logfile1
-ib_logfile2
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=7
-auto.cnf
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=8
-auto.cnf
-ib_logfile1
-ib_logfile101
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=9
-auto.cnf
-ib_logfile1
-ib_logfile101
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 --innodb-force-recovery-crash=10
-auto.cnf
-ib_logfile0
-ib_logfile1
-ibdata1
-master-bin.index
-mtr
-mysql
-performance_schema
-test
 SELECT * FROM t1;
 a
 42

=== 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@oracle.com-20120927191021-4uk5fqzw53edrrat
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size-1.test	revid:marko.makela@stripped
@@ -245,7 +245,7 @@ let SEARCH_PATTERN= InnoDB: .*ib_logfile
 --move_file $MYSQLD_DATADIR/ib_logfile1 $MYSQLD_DATADIR/ib_logfile1_hidden
 perl;
 die unless open(FILE, ">$ENV{MYSQLD_DATADIR}/ib_logfile1");
-print FILE "garbage\n" x 131072;
+print FILE "junkfill" x 131072;
 close(FILE);
 EOF
 

=== 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@stripped1021-4uk5fqzw53edrrat
+++ b/mysql-test/suite/innodb/t/innodb-log-file-size.test	revid:marko.makela@stripped0927212733-gdb457cyculh2ynd
@@ -67,25 +67,23 @@ let SEARCH_PATTERN= syntax error in inno
 --source include/search_pattern_in_file.inc
 --remove_file $SEARCH_FILE
 
+# On Windows, DBUG_SUICIDE() does exit(3) instead of SIGKILL (128+9).
 --echo --innodb-force-recovery-crash=1
---error 137
+--error 3,137
 --exec $MYSQLD_CMD $crash=1
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=2
---error 137
+--error 3,137
 --exec $MYSQLD_CMD $crash=2
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --echo --innodb-force-recovery-crash=3
---error 137
+--error 3,137
 --exec $MYSQLD_CMD $crash=3
 let SEARCH_PATTERN= InnoDB: Starting an apply batch of log records;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 
 --error 1
@@ -97,22 +95,20 @@ let SEARCH_PATTERN= InnoDB: Can.t initia
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=4
---error 137
+--error 3,137
 --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;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=5
---error 137
+--error 3,137
 --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;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 
 --error 1
@@ -122,19 +118,17 @@ let SEARCH_PATTERN= InnoDB: Can.t initia
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=6
---error 137
+--error 3,137
 --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;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=7
---error 137
+--error 3,137
 --exec $MYSQLD_CMD $crash=7
 # this crashes right after deleting all log files
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 
 --error 1
@@ -144,18 +138,16 @@ let SEARCH_PATTERN= InnoDB: Cannot creat
 --remove_file $SEARCH_FILE
 
 --echo --innodb-force-recovery-crash=8
---error 137
+--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 5 MB;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 --echo --innodb-force-recovery-crash=9
---error 137
+--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 5 MB;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 
 # We should have perfectly synced files here.
@@ -184,7 +176,7 @@ let SEARCH_PATTERN= InnoDB: Log file .*i
 
 perl;
 die unless open(FILE, ">$ENV{MYSQLD_DATADIR}/ib_logfile1");
-print FILE "garbage\n" x 131072;
+print FILE "junkfill" x 131072;
 close(FILE);
 EOF
 
@@ -198,13 +190,12 @@ let SEARCH_PATTERN= InnoDB: Log file .*i
 --move_file $MYSQLD_DATADIR/ib_logfile1_hidden $MYSQLD_DATADIR/ib_logfile1
 
 --echo --innodb-force-recovery-crash=10
---error 137
+--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 5 MB;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Renaming log file .*/ib_logfile101 to .*/ib_logfile0;
+let SEARCH_PATTERN= InnoDB: Renaming log file .*ib_logfile101 to .*ib_logfile0;
 --source include/search_pattern_in_file.inc
---list_files $MYSQLD_DATADIR
 --remove_file $SEARCH_FILE
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6-wl6494 branch (marko.makela:4340 to 4344) WL#6494marko.makela28 Sep