database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.1 into bb-10.2-mdev-11782

Browse Source
This commit is contained in:
Marko Mäkelä
2017-01-12 12:42:15 +02:00
parent fd0479ce59 2dc5d8bb7e
commit 7c81f15ec3
4 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/include/start_mysqld.inc
View File

@@ -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