Fixes for innodb crash recovery tests from Serg

MariaDB · Apr 2, 2017 · 099ba34 · 099ba34
1 parent 3599b49
commit 099ba34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/mysql-test/suite/innodb/r/log_file_size.result b/mysql-test/suite/innodb/r/log_file_size.result
@@ -25,7 +25,7 @@ ERROR 42000: Unknown storage engine 'InnoDB'
 FOUND 1 /syntax error in innodb_log_group_home_dir/ in mysqld.1.err
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
-FOUND 1 /InnoDB: Starting crash recovery from checkpoint LSN=/ in mysqld.1.err
+FOUND 1 /InnoDB: Starting crash recovery from checkpoint LSN=.*/ in mysqld.1.err
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
 SELECT * FROM t1;

diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test
@@ -29,6 +29,7 @@ BEGIN;
 INSERT INTO t1 VALUES (42);
 
 let $restart_parameters = --innodb-log-file-size=6M;
+let $shutdown_timeout=0;
 --source include/restart_mysqld.inc
 
 SELECT * FROM t1;
@@ -39,6 +40,7 @@ DELETE FROM t1;
 
 let $restart_parameters = --innodb-log-files-in-group=3 --innodb-log-file-size=5M;
 --source include/restart_mysqld.inc
+let $shutdown_timeout=;
 
 SELECT * FROM t1;
 
@@ -72,7 +74,7 @@ let SEARCH_PATTERN= syntax error in innodb_log_group_home_dir;
 --source include/restart_mysqld.inc
 --error ER_UNKNOWN_STORAGE_ENGINE
 SELECT * FROM t1;
-let SEARCH_PATTERN= InnoDB: Starting crash recovery from checkpoint LSN=;
+let SEARCH_PATTERN= InnoDB: Starting crash recovery from checkpoint LSN=.*;
 --source include/search_pattern_in_file.inc
 
 --let $restart_parameters= --debug=d,innodb_log_abort_3

diff --git a/mysql-test/suite/innodb_fts/t/crash_recovery.test b/mysql-test/suite/innodb_fts/t/crash_recovery.test
@@ -47,6 +47,7 @@ ROLLBACK;
 --disconnect flush_redo_log
 --connection default
 
+let $shutdown_timeout=0;
 --source include/restart_mysqld.inc
 
 # This insert will re-initialize the Doc ID counter, it should not crash