MDEV-11948 innodb.log_file fails in buildbot on CentOS 5

Rewrite the test so that the main server is restarted, instead of
--exec $MYSQLD_CMD. In this way, the test can be run with Valgrind
and with any --mysqld=--innodb-page-size.

Also remove the workaround --skip-innodb-use-native-aio. It should
not be needed when we are inheriting the server parameters from
the test environment.

mysql-test/suite/innodb/r/log_file.result

 # Testcase for the following bugs
 # Bug#16691130 - ASSERT WHEN INNODB_LOG_GROUP_HOME_DIR DOES NOT EXIST
 # Bug#16418661 - CHANGING NAME IN FOR INNODB_DATA_FILE_PATH SHOULD NOT SUCCEED WITH LOG FILES
-# Write tmp/log_file/my.cnf
 # Start mysqld without the possibility to create innodb_undo_tablespaces
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /\[ERROR\] InnoDB: Could not create undo tablespace '.*undo002'/ in mysqld.1.err
 # Remove  undo001,undo002,ibdata1,ibdata2,ib_logfile1,ib_logfile2,ib_logfile101
-my.cnf
-my_restart.err
 # Start mysqld with non existent innodb_log_group_home_dir
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /File .path.to.non-existent.*ib_logfile101: 'create' returned OS error \d+/ in mysqld.1.err
 # Remove ibdata1 & ibdata2
-my.cnf
-my_restart.err
-# Start mysqld to create tablespaces according to my.cnf
+# Successfully let InnoDB create tablespaces
+SELECT COUNT(*) `1` FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine='innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+1
+1
 # Backup tmp/logfile/*
 # 1. With ibdata2, Without ibdata1
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /The innodb_system data file 'ibdata1' was not found but one of the other data files 'ibdata2' exists/ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -26,12 +41,16 @@ ib_logfile0
 ib_logfile1
 ib_logfile2
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
 # 2. With ibdata1, without ibdata2
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /InnoDB: Tablespace size stored in header is \d+ pages, but the sum of data file sizes is \d+ pages/ in mysqld.1.err
+FOUND /InnoDB: Cannot start InnoDB. The tail of the system tablespace is missing/ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -46,8 +65,6 @@ ib_logfile1
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
@@ -64,11 +81,14 @@ ib_buffer_pool
 ib_logfile0
 ib_logfile1
 ib_logfile2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /InnoDB: undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\./ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -81,8 +101,6 @@ ib_buffer_pool
 ib_logfile0
 ib_logfile1
 ib_logfile2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
@@ -96,11 +114,13 @@ bak_undo001
 bak_undo002
 bak_undo003
 ib_buffer_pool
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -110,8 +130,6 @@ bak_undo001
 bak_undo002
 bak_undo003
 ib_buffer_pool
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
@@ -125,10 +143,12 @@ bak_undo001
 bak_undo002
 bak_undo003
 ib_buffer_pool
-my.cnf
-my_restart.err
 undo001
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -138,8 +158,6 @@ bak_undo001
 bak_undo002
 bak_undo003
 ib_buffer_pool
-my.cnf
-my_restart.err
 undo001
 undo003
 # 6. Without ibdata*,ib_logfile* files & Without undo001, undo002
@@ -152,9 +170,12 @@ bak_undo001
 bak_undo002
 bak_undo003
 ib_buffer_pool
-my.cnf
-my_restart.err
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /undo tablespace .*undo003.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\./ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -164,8 +185,6 @@ bak_undo001
 bak_undo002
 bak_undo003
 ib_buffer_pool
-my.cnf
-my_restart.err
 undo003
 # 7. With ibdata files & Without undo002
 bak_ib_logfile0
@@ -182,10 +201,13 @@ ib_logfile1
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /Expected to open 3 undo tablespaces but was able to find only 1 undo tablespaces/ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -200,8 +222,6 @@ ib_logfile1
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo003
 # 8. With ibdata files & Without undo001, undo002
@@ -219,9 +239,12 @@ ib_logfile1
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /Expected to open 3 undo tablespaces but was able to find only 0 undo tablespaces/ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -236,8 +259,6 @@ ib_logfile1
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo003
 # 9. Without ibdata*, without undo*, Without ib_logfile1 and with ib_logfile2
 bak_ib_logfile0
@@ -251,8 +272,12 @@ bak_undo003
 ib_buffer_pool
 ib_logfile0
 ib_logfile2
-my.cnf
-my_restart.err
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+InnoDB	YES	Supports transactions, row-level locking, foreign keys and encryption for tables	YES	YES	YES
+NOT FOUND /redo log file .*ib_logfile0.* exists\. Creating system tablespace with existing redo log files is not recommended\. Please delete all redo log files before creating new system tablespace\./ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -263,9 +288,36 @@ bak_undo002
 bak_undo003
 ib_buffer_pool
 ib_logfile0
+ib_logfile1
 ib_logfile2
-my.cnf
-my_restart.err
+ibdata1
+ibdata2
+undo001
+undo002
+undo003
+# 10. With ibdata*, without ib_logfile0
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+InnoDB	YES	Supports transactions, row-level locking, foreign keys and encryption for tables	YES	YES	YES
+bak_ib_logfile0
+bak_ib_logfile1
+bak_ib_logfile2
+bak_ibdata1
+bak_ibdata2
+bak_undo001
+bak_undo002
+bak_undo003
+ib_buffer_pool
+ib_logfile0
+ib_logfile1
+ib_logfile2
+ibdata1
+ibdata2
+undo001
+undo002
+undo003
 # 11. With ibdata*, without ib_logfile1
 bak_ib_logfile0
 bak_ib_logfile1
@@ -280,11 +332,14 @@ ib_logfile0
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
+SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+FOUND /Only one log file found/ in mysqld.1.err
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -298,8 +353,6 @@ ib_logfile0
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
@@ -317,11 +370,15 @@ ib_logfile0
 ib_logfile1
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003
+SELECT COUNT(*) `1` FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine='innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+1
+1
+FOUND /Resizing redo log from 2\*\d+ to 3\*\d+ pages, LSN=\d+/ in mysqld.1.err
 # Cleanup
 bak_ib_logfile0
 bak_ib_logfile1
@@ -337,8 +394,6 @@ ib_logfile1
 ib_logfile2
 ibdata1
 ibdata2
-my.cnf
-my_restart.err
 undo001
 undo002
 undo003

mysql-test/suite/innodb/t/log_file.test

@@ -4,48 +4,51 @@
 
 --source include/have_innodb.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Could not create undo tablespace.*undo002");
+call mtr.add_suppression("InnoDB: InnoDB Database creation was aborted");
+call mtr.add_suppression("Plugin 'InnoDB' init function returned error");
+call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
+call mtr.add_suppression("InnoDB: Operating system error number \d+ in a file operation");
+call mtr.add_suppression("InnoDB: The error means the system cannot find the path specified");
+call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself");
+call mtr.add_suppression("InnoDB: File .path.to.non-existent.ib_logfile101: 'create' returned OS error \d+");
+call mtr.add_suppression("InnoDB: Cannot create .path.to.non-existent.ib_logfile101");
+call mtr.add_suppression("InnoDB: The innodb_system data file 'ibdata1' was not found but one of the other data files 'ibdata2' exists");
+call mtr.add_suppression("InnoDB: Tablespace size stored in header is \d+ pages, but the sum of data file sizes is \d+ pages");
+call mtr.add_suppression("InnoDB: Cannot start InnoDB. The tail of the system tablespace is missing");
+call mtr.add_suppression("InnoDB: undo tablespace '.*undo001' exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.");
+call mtr.add_suppression("");
+call mtr.add_suppression("");
+--enable_query_log
+
 let bugdir= $MYSQLTEST_VARDIR/tmp/log_file;
 --mkdir $bugdir
 
---let SEARCH_RANGE = -50000
---let SEARCH_FILE = $bugdir/my_restart.err
---let SEARCH_ABORT=NOT FOUND
---let $args=--defaults-file=$bugdir/my.cnf --loose-console > $SEARCH_FILE 2>&1
-
---echo # Write tmp/log_file/my.cnf
-
-perl;
-die unless open IN, "<", "$ENV{MYSQLTEST_VARDIR}/my.cnf";
-my $found;
-while (<IN>) { $found=$1 if /^(lc-messages-dir=.*)/ }
-close IN;
-
-die unless defined $found;
-die unless open OUT, ">", "$ENV{bugdir}/my.cnf";
-print OUT "[mysqld]
-$found
-innodb_data_home_dir = $ENV{bugdir}
-datadir = $ENV{bugdir}
-secure_file_priv=
-skip_aria
-core_file
-innodb_data_file_path = ibdata1:10M;ibdata2:10M:autoextend
-innodb_undo_logs = 20
-innodb_undo_tablespaces = 3
-innodb_log_files_in_group = 3
-skip_innodb_use_native_aio # MDEV-11948 CentOS 5 fails to write ib_logfile101
-";
-close(OUT);
-EOF
+let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
+let SEARCH_RANGE = -50000;
+let $check_no_innodb=SELECT * FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine = 'innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+
+let $check_yes_innodb=SELECT COUNT(*) `1` FROM INFORMATION_SCHEMA.ENGINES
+WHERE engine='innodb'
+AND support IN ('YES', 'DEFAULT', 'ENABLED');
+
+--let $ibp=--innodb-log-files-in-group=3 --innodb-log-group-home-dir=$bugdir
+--let $ibp=$ibp --innodb-data-home-dir=$bugdir --innodb-undo-directory=$bugdir
+--let $ibp=$ibp --innodb-undo-logs=20 --innodb-undo-tablespaces=3
+--let $ibp=$ibp --innodb-data-file-path=ibdata1:16M;ibdata2:10M:autoextend
 
 --echo # Start mysqld without the possibility to create innodb_undo_tablespaces
+--let $restart_parameters= $ibp --innodb-undo-tablespaces=3
 --mkdir $bugdir/undo002
---error 1
---exec $MYSQLD $args
+--source include/restart_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+
 let SEARCH_PATTERN=\[ERROR\] InnoDB: Could not create undo tablespace '.*undo002';
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
 
 --echo # Remove  undo001,undo002,ibdata1,ibdata2,ib_logfile1,ib_logfile2,ib_logfile101
 --remove_file $bugdir/undo001
@@ -58,28 +61,23 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --list_files $bugdir
 
 --echo # Start mysqld with non existent innodb_log_group_home_dir
---error 1
---exec $MYSQLD $args --innodb_log_group_home_dir=/path/to/non-existent/
+--let $restart_parameters= $ibp --innodb_log_group_home_dir=/path/to/non-existent/
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 let SEARCH_PATTERN=File .path.to.non-existent.*ib_logfile101: 'create' returned OS error \d+;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
 
 --echo # Remove ibdata1 & ibdata2
 --remove_file $bugdir/ibdata1
 --remove_file $bugdir/ibdata2
 --list_files $bugdir
 
-# Innodb creates system tablespaces according to my.cnf and aborts
-# complaining about mysql.* tables. This is sufficient for testing
-# missing tablespaces.
---echo # Start mysqld to create tablespaces according to my.cnf
---error 2
---exec $MYSQLD $args --skip-grant-tables --innodb-unknown-parameter
-let SEARCH_PATTERN=unknown option '--innodb-unknown-parameter';
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
+--echo # Successfully let InnoDB create tablespaces
+--let $restart_parameters= $ibp
+--source include/start_mysqld.inc
+eval $check_yes_innodb;
+--source include/shutdown_mysqld.inc
 
 --echo # Backup tmp/logfile/*
 --copy_file $bugdir/ibdata1 $bugdir/bak_ibdata1
@@ -93,23 +91,24 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 
 --echo # 1. With ibdata2, Without ibdata1
 --remove_file $bugdir/ibdata1
---error 1
---exec $MYSQLD $args
+
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 let SEARCH_PATTERN=The innodb_system data file 'ibdata1' was not found but one of the other data files 'ibdata2' exists;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
 
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
 
 --echo # 2. With ibdata1, without ibdata2
 --remove_file $bugdir/ibdata2
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=Tablespace size stored in header is \d+ pages, but;
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+let SEARCH_PATTERN=InnoDB: Tablespace size stored in header is \d+ pages, but the sum of data file sizes is \d+ pages;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
+let SEARCH_PATTERN=InnoDB: Cannot start InnoDB. The tail of the system tablespace is missing;
 --source include/search_pattern_in_file.inc
 
 # clean up & Restore
@@ -119,11 +118,10 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_file $bugdir/ibdata1
 --remove_file $bugdir/ibdata2
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+let SEARCH_PATTERN=InnoDB: undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
 
 # clean up & Restore
@@ -133,28 +131,21 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_files_wildcard $bugdir ibdata*
 --remove_files_wildcard $bugdir ib_logfile*
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
 
-
 --echo # 5. Without ibdata*,ib_logfile* files & Without undo002
 --remove_files_wildcard $bugdir ibdata*
 --remove_files_wildcard $bugdir ib_logfile*
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=undo tablespace .*undo001.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
@@ -166,12 +157,11 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_file $bugdir/undo001
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 let SEARCH_PATTERN=undo tablespace .*undo003.* exists\. Creating system tablespace with existing undo tablespaces is not supported\. Please delete all undo tablespaces before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
 
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
@@ -179,13 +169,10 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --echo # 7. With ibdata files & Without undo002
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=Expected to open 3 undo tablespaces but was able;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=to find only 1 undo tablespaces;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+let SEARCH_PATTERN=Expected to open 3 undo tablespaces but was able to find only 1 undo tablespaces;
 --source include/search_pattern_in_file.inc
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
@@ -194,13 +181,10 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_file $bugdir/undo001
 --remove_file $bugdir/undo002
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=Expected to open 3 undo tablespaces but was able;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=to find only 0 undo tablespaces;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+let SEARCH_PATTERN=Expected to open 3 undo tablespaces but was able to find only 0 undo tablespaces;
 --source include/search_pattern_in_file.inc
 
 # clean up & Restore
@@ -211,35 +195,32 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --remove_files_wildcard $bugdir undo00*
 --remove_file $bugdir/ib_logfile1
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 let SEARCH_PATTERN=redo log file .*ib_logfile0.* exists\. Creating system tablespace with existing redo log files is not recommended\. Please delete all redo log files before creating new system tablespace\.;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
 
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
 
-# 10. With ibdata*, without ib_logfile0
-#--remove_file $bugdir/ib_logfile0
-# The below would start the server. Since we cannot start a parallel
-# server, do not test the below case
-#--error 1
-#--exec $MYSQLD $args
+--echo # 10. With ibdata*, without ib_logfile0
+--remove_file $bugdir/ib_logfile0
 
-# clean up & Restore
-#--source ../include/log_file_cleanup.inc
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
+
+--source ../include/log_file_cleanup.inc
 
 --echo # 11. With ibdata*, without ib_logfile1
 --remove_file $bugdir/ib_logfile1
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
+--source include/start_mysqld.inc
+eval $check_no_innodb;
+--source include/shutdown_mysqld.inc
 let SEARCH_PATTERN=Only one log file found;
 --source include/search_pattern_in_file.inc
-let SEARCH_PATTERN=\[ERROR\] Aborting;
---source include/search_pattern_in_file.inc
 
 # clean up & Restore
 --source ../include/log_file_cleanup.inc
@@ -247,16 +228,16 @@ let SEARCH_PATTERN=\[ERROR\] Aborting;
 --echo # 12. With ibdata*, without ib_logfile2
 --remove_file $bugdir/ib_logfile2
 --list_files $bugdir
---error 1
---exec $MYSQLD $args
-let SEARCH_PATTERN=Resizing redo log from \d+\*\d+ to \d+\*\d+ pages, LSN=\d+;
+--source include/start_mysqld.inc
+eval $check_yes_innodb;
+--source include/shutdown_mysqld.inc
+let SEARCH_PATTERN=Resizing redo log from 2\*\d+ to 3\*\d+ pages, LSN=\d+;
 --source include/search_pattern_in_file.inc
 
+--let $restart_parameters=
+--source include/start_mysqld.inc
+
 --echo # Cleanup
-# Remove ibtmp* which are re-generated after each mysqld invocation
-# skip auto generated auto.cnf from list_files
---remove_files_wildcard $bugdir auto.cnf
---remove_files_wildcard $bugdir ibtmp*
 --list_files $bugdir
 --remove_files_wildcard $bugdir
 --rmdir $bugdir