diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 11:34:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 11:34:30 +0200 |
| commit | 866ccc8890a3932e260e43fa5fc7ab8170e6cc3d (patch) | |
| tree | 33a95867072308d4973d3a812bcc088dcbf55a64 /mysql-test/include | |
| parent | 159a6c2e608d04732cb678c7691345b9b1dc69b1 (diff) | |
| parent | 1b5f0cbd465f92ffc278a924e765e41413d97420 (diff) | |
| download | mariadb-git-866ccc8890a3932e260e43fa5fc7ab8170e6cc3d.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/kill_and_restart_mysqld.inc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mysql-test/include/kill_and_restart_mysqld.inc b/mysql-test/include/kill_and_restart_mysqld.inc deleted file mode 100644 index b67fb7350b4..00000000000 --- a/mysql-test/include/kill_and_restart_mysqld.inc +++ /dev/null @@ -1,15 +0,0 @@ -if (!$restart_parameters) -{ - let $restart_parameters = restart; -} - ---let $_server_id= `SELECT @@server_id` ---let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect - ---echo # Kill and $restart_parameters ---exec echo "$restart_parameters" > $_expect_file_name ---shutdown_server 0 ---source include/wait_until_disconnected.inc ---enable_reconnect ---source include/wait_until_connected_again.inc ---disable_reconnect |