diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-12 11:18:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-31 19:28:58 +0200 |
| commit | d6d994bf42be0b855e3eb1c4d672a4871a186652 (patch) | |
| tree | f59e6bc257a0d5a5e70920427750021396ac5c09 /mysql-test/include | |
| parent | 143e771deef47e4afdd5d8dcdaddc424f919af83 (diff) | |
| download | mariadb-git-d6d994bf42be0b855e3eb1c4d672a4871a186652.tar.gz | |
remove two redundant *.inc files to restart a server
namely, restart_mysqld_with_option.inc and kill_and_restart_mysqld.inc -
use restart_mysqld.inc instead.
Also remove innodb_wl6501_crash_stripped.inc that wasn't used anywhere.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/kill_and_restart_mysqld.inc | 19 | ||||
| -rw-r--r-- | mysql-test/include/restart_mysqld_with_option.inc | 31 |
2 files changed, 0 insertions, 50 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 f2ac9b504d2..00000000000 --- a/mysql-test/include/kill_and_restart_mysqld.inc +++ /dev/null @@ -1,19 +0,0 @@ ---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 diff --git a/mysql-test/include/restart_mysqld_with_option.inc b/mysql-test/include/restart_mysqld_with_option.inc deleted file mode 100644 index 4250b368b1a..00000000000 --- a/mysql-test/include/restart_mysqld_with_option.inc +++ /dev/null @@ -1,31 +0,0 @@ - -if ($rpl_inited) -{ - if (!$allow_rpl_inited) - { - --die ERROR IN TEST: This script does not support replication - } -} - -# Write file to make mysql-test-run.pl expect the "crash", but don't start -# it until it's told to ---let $_server_id= `SELECT @@server_id` ---let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect ---exec echo "wait" > $_expect_file_name - -# Send shutdown to the connected server and give -# it 10 seconds to die before zapping it -shutdown_server 10; - -# Write file to make mysql-test-run.pl start up the server again ---exec echo "restart:$_mysqld_option" > $_expect_file_name - -# Turn on reconnect ---enable_reconnect - -# Call script that will poll the server waiting for it to be back online again ---source include/wait_until_connected_again.inc - -# Turn off reconnect again ---disable_reconnect - |