summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-01-23 17:18:57 +0100
committerSergei Golubchik <serg@mariadb.org>2019-01-23 17:18:57 +0100
commit7886a70ef9d8a0fe8f8c0d8ef5c524187e58eaf0 (patch)
tree32e1816a5045dd5deeecd2a6b6fb457bc0cf2011 /mysql-test
parent2d098933eef9b988da9a57ed294cc8a63582cdcf (diff)
downloadmariadb-git-7886a70ef9d8a0fe8f8c0d8ef5c524187e58eaf0.tar.gz
MDEV-17421: mtr does not restart the server whose parameters were changed
remove tests that rely on specific execution order
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/rpl/r/mtr_restart_t1.result5
-rw-r--r--mysql-test/suite/rpl/r/mtr_restart_t2.result4
-rw-r--r--mysql-test/suite/rpl/t/mtr_restart_t1.test31
-rw-r--r--mysql-test/suite/rpl/t/mtr_restart_t2.test18
4 files changed, 0 insertions, 58 deletions
diff --git a/mysql-test/suite/rpl/r/mtr_restart_t1.result b/mysql-test/suite/rpl/r/mtr_restart_t1.result
deleted file mode 100644
index 56b64a2fc70..00000000000
--- a/mysql-test/suite/rpl/r/mtr_restart_t1.result
+++ /dev/null
@@ -1,5 +0,0 @@
-include/master-slave.inc
-[connection master]
-include/rpl_stop_server.inc [server_number=1]
-new auto_increment_offset=111
-include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/mtr_restart_t2.result b/mysql-test/suite/rpl/r/mtr_restart_t2.result
deleted file mode 100644
index 3c8fe59d607..00000000000
--- a/mysql-test/suite/rpl/r/mtr_restart_t2.result
+++ /dev/null
@@ -1,4 +0,0 @@
-include/master-slave.inc
-[connection master]
-auto_increment_offset=1
-include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/mtr_restart_t1.test b/mysql-test/suite/rpl/t/mtr_restart_t1.test
deleted file mode 100644
index 3003a49c424..00000000000
--- a/mysql-test/suite/rpl/t/mtr_restart_t1.test
+++ /dev/null
@@ -1,31 +0,0 @@
-# This test verifies that mtr will restart the mysqld process,
-# whose parameters were changed during the test. The verification
-# itself is carried out in the following mtr_restart_t2 test.
-# If mtr restart the mysqld process, then the auto_increment_offset
-# parameter value will be reset to the default ("1"), but if there
-# is no restart, then we will see the changed value ("111") during
-# the next test.
-#
---source include/have_binlog_format_row.inc
---source include/master-slave.inc
-
-connection master;
-
-let $auto_increment_offset = `SELECT @@global.auto_increment_offset`;
-
---let $rpl_server_number=1
-source include/rpl_stop_server.inc;
---let $rpl_server_parameters=--auto-increment-offset=111
---let $keep_include_silent=1
-source include/rpl_start_server.inc;
---let $keep_include_silent=0
-
-let $auto_increment_offset_new = `SELECT @@global.auto_increment_offset`;
---echo new auto_increment_offset=$auto_increment_offset_new
-
---disable_query_log
---eval SET @@global.auto_increment_offset = $auto_increment_offset;
---enable_query_log
-
---connection master
---source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/mtr_restart_t2.test b/mysql-test/suite/rpl/t/mtr_restart_t2.test
deleted file mode 100644
index ab246af6b44..00000000000
--- a/mysql-test/suite/rpl/t/mtr_restart_t2.test
+++ /dev/null
@@ -1,18 +0,0 @@
-# This test verifies that mtr will restart the mysqld process,
-# whose parameters were changed during the previous test. If mtr
-# restart the mysqld process, then the auto_increment_offsert
-# parameter value will be reset to the default ("1"), but if there
-# is no restart, then we will see the changed value ("111") in
-# this test.
-#
---source include/have_binlog_format_row.inc
---source include/master-slave.inc
-
-connection master;
-
-let $auto_increment_offset = `SELECT @@global.auto_increment_offset`;
-
---echo auto_increment_offset=$auto_increment_offset
-
---connection master
---source include/rpl_end.inc