remove few obscure, unused, or misused mtr features

4 files changed, 0 insertions, 50 deletions

diff --git a/mysql-test/include/force_restart.inc b/mysql-test/include/force_restart.inc
deleted file mode 100644
index d058e85df45..00000000000
--- a/mysql-test/include/force_restart.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# ==== Purpose ====
-#
-# Tell mtr that all servers must be restarted after the test has
-# finished.
-#
-# ==== Usage ====
-#
-# --source include/force_restart.inc
-#
-# ==== See also ====
-#
-# include/force_restart_if_skipped.inc
-
---let $_force_restart_datadir= `SELECT @@datadir`
---append_file $_force_restart_datadir/mtr/force_restart
-1
-EOF
diff --git a/mysql-test/include/force_restart_if_skipped.inc b/mysql-test/include/force_restart_if_skipped.inc
deleted file mode 100644
index 228e094e932..00000000000
--- a/mysql-test/include/force_restart_if_skipped.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# ==== Purpose ====
-#
-# Tell mtr that all servers must be restarted in case the test is
-# skipped.
-#
-# ==== Usage ====
-#
-# --source include/force_restart_if_skipped.inc
-#
-# ==== See also ====
-#
-# include/force_restart.inc
-
---let $_force_restart_datadir= `SELECT @@datadir`
---append_file $_force_restart_datadir/mtr/force_restart_if_skipped
-1
-EOF
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql
index 939a3215fd5..aa0d91a9cf8 100644
--- a/mysql-test/include/mtr_check.sql
+++ b/mysql-test/include/mtr_check.sql
@@ -76,12 +76,3 @@ BEGIN
 
 END||
 
---
--- Procedure used by test case used to force all
--- servers to restart after testcase and thus skipping
--- check test case after test
---
-CREATE DEFINER=root@localhost PROCEDURE force_restart()
-BEGIN
-  SELECT 1 INTO OUTFILE 'force_restart';
-END||
diff --git a/mysql-test/include/rpl_init.inc b/mysql-test/include/rpl_init.inc
index 6419682e650..e608a1223a5 100644
--- a/mysql-test/include/rpl_init.inc
+++ b/mysql-test/include/rpl_init.inc
@@ -189,13 +189,6 @@ while ($_rpl_server)
 # Signal that initialization is done and all connections created.
 --let $rpl_inited= 1
 
-# Signal that the server is in a dirty state and needs to be restarted
-# if the test is skipped. If the test is not skipped, it will continue
-# to the end and execute its cleanup section (and check-testcase will
-# report if you forget to clean up).
---source include/force_restart_if_skipped.inc
-
-
 # Assert that all hosts have different server_ids
 if ($rpl_check_server_ids)
 {