diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-25 15:11:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-26 13:58:58 +0200 |
| commit | 49fe9bad01cbd7f66efd52171c4234636ba61276 (patch) | |
| tree | bfefbb31807fd8e13b17f4535c4065808ca98900 /mysql-test/include/start_mysqld.inc | |
| parent | 8725b35d897cfad6e55217ae80e7c387e8dfe8da (diff) | |
| download | mariadb-git-49fe9bad01cbd7f66efd52171c4234636ba61276.tar.gz | |
MDEV-11814 Refuse innodb_read_only startup if crash recovery is needed
recv_scan_log_recs(): Remember if redo log apply is needed,
even if starting up in innodb_read_only mode.
recv_recovery_from_checkpoint_start_func(): Refuse
innodb_read_only startup if redo log apply is needed.
Diffstat (limited to 'mysql-test/include/start_mysqld.inc')
| -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 |