diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-23 17:20:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-23 17:20:41 +0100 |
| commit | d24060b1796bac5b11aee49f1c157dfc2c8200c1 (patch) | |
| tree | cd36b77b7fd045ff5cb841572dfb75c44fea401c /mysql-test/suite | |
| parent | 7886a70ef9d8a0fe8f8c0d8ef5c524187e58eaf0 (diff) | |
| download | mariadb-git-d24060b1796bac5b11aee49f1c157dfc2c8200c1.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/suite')
4 files changed, 0 insertions, 50 deletions
diff --git a/mysql-test/suite/galera/r/galera_mtr_restart_t1.result b/mysql-test/suite/galera/r/galera_mtr_restart_t1.result deleted file mode 100644 index c628a99f1e8..00000000000 --- a/mysql-test/suite/galera/r/galera_mtr_restart_t1.result +++ /dev/null @@ -1 +0,0 @@ -weight=111 diff --git a/mysql-test/suite/galera/r/galera_mtr_restart_t2.result b/mysql-test/suite/galera/r/galera_mtr_restart_t2.result deleted file mode 100644 index 0d488f3d174..00000000000 --- a/mysql-test/suite/galera/r/galera_mtr_restart_t2.result +++ /dev/null @@ -1 +0,0 @@ -weight=1 diff --git a/mysql-test/suite/galera/t/galera_mtr_restart_t1.test b/mysql-test/suite/galera/t/galera_mtr_restart_t1.test deleted file mode 100644 index 563d199625a..00000000000 --- a/mysql-test/suite/galera/t/galera_mtr_restart_t1.test +++ /dev/null @@ -1,35 +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 galera_mtr_restart_t2 -# test. If mtr restart the mysqld process, then the pc.weight -# 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/galera_cluster.inc ---source include/have_innodb.inc - -# Save original auto_increment_offset values. ---let $node_1=node_1 ---let $node_2=node_2 ---source include/auto_increment_offset_save.inc - ---connection node_2 ---let $restart_parameters = --wsrep_provider_options=pc.weight=111;repl.causal_read_timeout=PT90S;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S ---source include/restart_mysqld.inc - ---connection node_1 ---let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; ---source include/wait_condition.inc - ---connection node_2 ---source include/wait_until_ready.inc - -# Check that the parameter value really changed: ---let $gp = `SELECT SUBSTR(@@wsrep_provider_options, LOCATE('pc.weight =', @@wsrep_provider_options) + LENGTH('pc.weight = '))` ---let $weight = `SELECT SUBSTR('$gp', 1, LOCATE(';', '$gp') - 1)` ---echo weight=$weight - -# Restore original auto_increment_offset values. ---connection node_1 ---source include/auto_increment_offset_restore.inc diff --git a/mysql-test/suite/galera/t/galera_mtr_restart_t2.test b/mysql-test/suite/galera/t/galera_mtr_restart_t2.test deleted file mode 100644 index fcc1d0515a6..00000000000 --- a/mysql-test/suite/galera/t/galera_mtr_restart_t2.test +++ /dev/null @@ -1,13 +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 pc.weight 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/galera_cluster.inc ---source include/have_innodb.inc - ---connection node_2 ---let $gp = `SELECT SUBSTR(@@wsrep_provider_options, LOCATE('pc.weight =', @@wsrep_provider_options) + LENGTH('pc.weight = '))` ---let $weight = `SELECT SUBSTR('$gp', 1, LOCATE(';', '$gp') - 1)` ---echo weight=$weight |