diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
commit | 93ac7ae70ff000353538f732899b421a3f2ea7ce (patch) | |
tree | 819b5ca057d80b42699de219c982b7924857c406 /mysql-test/suite/galera_3nodes/suite.pm | |
parent | 4932aba921755cfbc351b92c67068a5c48d3922b (diff) | |
parent | a40de1bdeb218d66d5cc737758a4bab1b06f255d (diff) | |
download | mariadb-git-93ac7ae70ff000353538f732899b421a3f2ea7ce.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/galera_3nodes/suite.pm')
-rw-r--r-- | mysql-test/suite/galera_3nodes/suite.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/suite/galera_3nodes/suite.pm b/mysql-test/suite/galera_3nodes/suite.pm index 9882793cb20..5ed5cbd95db 100644 --- a/mysql-test/suite/galera_3nodes/suite.pm +++ b/mysql-test/suite/galera_3nodes/suite.pm @@ -50,9 +50,12 @@ 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: 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), qr(WSREP: .* sending install message failed: Transport endpoint is not connected), qr(WSREP: .* sending install message failed: Resource temporarily unavailable), + qr(WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.), qr(WSREP: Could not find peer:), qr|WSREP: gcs_caused\(\) returned .*|, qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|, @@ -78,11 +81,11 @@ sub skip_combinations { my %skip = (); $skip{'include/have_filekeymanagement.inc'} = 'needs file_key_management plugin' unless $ENV{FILE_KEY_MANAGEMENT_SO}; - $skip{'include/have_mariabackup.inc'} = 'Need mariabackup' + $skip{'suite/galera/include/have_mariabackup.inc'} = 'Need mariabackup' unless which(mariabackup); - $skip{'include/have_mariabackup.inc'} = 'Need ss' + $skip{'suite/galera/include/have_mariabackup.inc'} = 'Need ss' unless which(ss); - $skip{'include/have_mariabackup.inc'} = 'Need socat or nc' + $skip{'suite/galera/include/have_mariabackup.inc'} = 'Need socat or nc' unless $ENV{MTR_GALERA_TFMT}; %skip; } |