summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-02-03 19:33:09 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-02-03 19:33:09 +0200
commite174d923d94bd183bef8ab6a1da3777ae738c945 (patch)
treeda9e3689895b07af7cd09be542947feabbf0a473 /mysql-test/include
parent1d725c81769015b2a2e3d13296b0046f0eeb8065 (diff)
downloadmariadb-git-e174d923d94bd183bef8ab6a1da3777ae738c945.tar.gz
innodb.innodb-get-fk: Actually test --innodb-read-only.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/restart_mysqld.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc
index 71efb141917..dcaf47c55a2 100644
--- a/mysql-test/include/restart_mysqld.inc
+++ b/mysql-test/include/restart_mysqld.inc
@@ -35,7 +35,14 @@ if ($shutdown_timeout == 0)
shutdown_server $server_shutdown_timeout;
# 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