diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-12 12:33:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-12 12:33:46 +0200 |
| commit | 2dc5d8bb7e087a340edb989c045070b808e0da57 (patch) | |
| tree | fc1a89fafcbb426d78bb61ebb119b797b04b9937 /mysql-test/include | |
| parent | 4507f1e5d4fbfc2a638417683fc71d1768729cac (diff) | |
| download | mariadb-git-2dc5d8bb7e087a340edb989c045070b808e0da57.tar.gz | |
Improve an MDEV-9011 test of innodb_encrypt_log.
Test crash recovery from an encrypted redo log with innodb_encrypt_log=0.
Previously, we did a clean shutdown, so only the log checkpoint
information would have been read from the redo log. With this change,
we will be reading and applying encrypted redo log records.
include/start_mysqld.inc: Observe $restart_parameters.
encryption.innodb-log-encrypt: Remove some unnecessary statements,
and instead of restarting the server and concurrently accessing
the files while the server is running, kill the server, check the
files, and finally start up the server.
innodb.log_data_file_size: Use start_mysqld.inc with $restart_parameters.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/start_mysqld.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc index 983c566821e..e31f26aad8c 100644 --- a/mysql-test/include/start_mysqld.inc +++ b/mysql-test/include/start_mysqld.inc @@ -1,7 +1,14 @@ # Include this script only after using shutdown_mysqld.inc # where $_expect_file_name was initialized. # Write file to make mysql-test-run.pl start up the server again ---exec echo "restart" > $_expect_file_name +if ($restart_parameters) +{ + --exec echo "restart: $restart_parameters" > $_expect_file_name +} +if (!$restart_parameters) +{ + --exec echo "restart" > $_expect_file_name +} # Turn on reconnect --enable_reconnect |