diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-26 23:40:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-26 23:40:11 +0200 |
| commit | f1f8ebc325d2b91991ee0de8488f482dc81bbf27 (patch) | |
| tree | efea0f337e3344e9401f95dd851ec807bbe93ffc /mysql-test/include | |
| parent | 6fbfb4c83c01fef445185b473d4dc1e0cc78db0a (diff) | |
| parent | afb461587c0b7dea2e5e70a165e8d4d437c3f964 (diff) | |
| download | mariadb-git-f1f8ebc325d2b91991ee0de8488f482dc81bbf27.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/kill_and_restart_mysqld.inc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/include/kill_and_restart_mysqld.inc b/mysql-test/include/kill_and_restart_mysqld.inc new file mode 100644 index 00000000000..f2ac9b504d2 --- /dev/null +++ b/mysql-test/include/kill_and_restart_mysqld.inc @@ -0,0 +1,19 @@ +--let $_server_id= `SELECT @@server_id` +--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect + +if ($restart_parameters) +{ + --echo # Kill and restart: $restart_parameters + --exec echo "restart: $restart_parameters" > $_expect_file_name +} +if (!$restart_parameters) +{ + --echo # Kill and restart + --exec echo "restart" > $_expect_file_name +} + +--shutdown_server 0 +--source include/wait_until_disconnected.inc +--enable_reconnect +--source include/wait_until_connected_again.inc +--disable_reconnect |