diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-12 12:42:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-12 13:00:11 +0200 |
| commit | 7c81f15ec3bcc8ad5a11e2151354bc27c4ce7ab4 (patch) | |
| tree | f170466904c8fcca01cb9fb661d426e8749d781f /mysql-test/include | |
| parent | fd0479ce592e0b7c13d67b5deda62e9090956309 (diff) | |
| parent | 2dc5d8bb7e087a340edb989c045070b808e0da57 (diff) | |
| download | mariadb-git-7c81f15ec3bcc8ad5a11e2151354bc27c4ce7ab4.tar.gz | |
Merge 10.1 into bb-10.2-mdev-11782
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 |