Merge 10.4 into 10.5

1 files changed, 10 insertions, 9 deletions

diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 4bce28aceb2..447c2b79d2b 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -1,16 +1,11 @@
 package My::Suite::Galera;
-use File::Basename;
-use My::Find;
 
-@ISA = qw(My::Suite);
-
-return "Not run for embedded server" if $::opt_embedded_server;
-
-return "WSREP is not compiled in" if not ::have_wsrep();
+use lib 'suite';
+use wsrep::common;
 
-return "No wsrep provider library" unless ::have_wsrep_provider();
+@ISA = qw(My::Suite);
 
-return ::wsrep_version_message() unless ::check_wsrep_version();
+return wsrep_not_ok() if wsrep_not_ok();
 
 push @::global_suppressions,
   (
@@ -69,4 +64,10 @@ push @::global_suppressions,
      qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*),
    );
 
+sub skip_combinations {
+  my %skip = ();
+  $skip{'include/have_mariabackup.inc'} = 'Need ss' unless `ss -V`;
+  %skip;
+}
+
 bless { };