revision-id: 1b6b99be24b1757fc7ee06f5dc4c3af0218aedc8 (mariadb-10.3.12-52-g1b6b99be24b) parent(s): dcc838168fc711386367af65cc0a62e1f18edef1 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-02-12 16:17:47 +0100 message: tempesta fixes --- mysql-test/suite/galera_3nodes/include/have_mariabackup.inc | 4 ---- mysql-test/suite/galera_3nodes/r/galera_pc_weight.result | 5 ----- mysql-test/suite/galera_3nodes/suite.pm | 1 - mysql-test/suite/galera_3nodes/t/galera_garbd.test | 1 + mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test | 2 +- mysql-test/suite/galera_3nodes/t/galera_ipv6_xtrabackup-v2.opt | 1 - 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/galera_3nodes/include/have_mariabackup.inc b/mysql-test/suite/galera_3nodes/include/have_mariabackup.inc deleted file mode 100644 index 0dd693f2c63..00000000000 --- a/mysql-test/suite/galera_3nodes/include/have_mariabackup.inc +++ /dev/null @@ -1,4 +0,0 @@ -# -# suite.pm will make sure that all tests including this file -# will be skipped as needed -# diff --git a/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result b/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result index aca9a1d2059..5fb9c1b9d66 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result +++ b/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result @@ -79,13 +79,8 @@ VARIABLE_VALUE = 'Synced' SET GLOBAL wsrep_provider_options = 'pc.weight=1'; SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_weight'; VARIABLE_VALUE = 1 -<<<<<<< HEAD -connection node_1; -||||||| merged common ancestors -======= 1 connection node_1; ->>>>>>> 10.2 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0'; connection node_2; connection node_3; diff --git a/mysql-test/suite/galera_3nodes/suite.pm b/mysql-test/suite/galera_3nodes/suite.pm index 3c2074320f3..a7c1bf79c06 100644 --- a/mysql-test/suite/galera_3nodes/suite.pm +++ b/mysql-test/suite/galera_3nodes/suite.pm @@ -50,7 +50,6 @@ push @::global_suppressions, qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside. Will use that one.), qr(WSREP: evs::proto.*), qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|, - qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|, qr(WSREP: no nodes coming from prim view, prim not possible), qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable), qr(WSREP: user message in state LEAVING), diff --git a/mysql-test/suite/galera_3nodes/t/galera_garbd.test b/mysql-test/suite/galera_3nodes/t/galera_garbd.test index 869bad8894f..2d03e8897b9 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_garbd.test +++ b/mysql-test/suite/galera_3nodes/t/galera_garbd.test @@ -10,6 +10,7 @@ --let $galera_connection_name = node_3 --let $galera_server_number = 3 --source include/galera_connect.inc + # Save original auto_increment_offset values. --let $node_1=node_1 --let $node_2=node_2 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test index 8cbd8cf2454..84c33251c98 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test @@ -1,6 +1,6 @@ --source include/galera_cluster.inc --source include/check_ipv6.inc ---source include/have_mariabackup.inc +--source suite/galera/include/have_mariabackup.inc # Confirm that initial handshake happened over ipv6 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_xtrabackup-v2.opt b/mysql-test/suite/galera_3nodes/t/galera_ipv6_xtrabackup-v2.opt deleted file mode 100644 index c195dd0f35b..00000000000 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_xtrabackup-v2.opt +++ /dev/null @@ -1 +0,0 @@ ---bind-address=:: --skip-innodb-safe-truncate