diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
| commit | 496d0372ef2ff2a570c20923af4df32a03781acd (patch) | |
| tree | c15d45eeff0fbbfe6112816a72e10352551269ee /mysql-test/suite/galera_sr | |
| parent | d4da131cff004e4157b755e417c49daef45ca80e (diff) | |
| parent | 5ba2aa1ddc074dc89db7f265ddb61ce96f714fc8 (diff) | |
| download | mariadb-git-496d0372ef2ff2a570c20923af4df32a03781acd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/galera_sr')
| -rw-r--r-- | mysql-test/suite/galera_sr/suite.pm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mysql-test/suite/galera_sr/suite.pm b/mysql-test/suite/galera_sr/suite.pm index 878e2d0fffd..cc13421d66d 100644 --- a/mysql-test/suite/galera_sr/suite.pm +++ b/mysql-test/suite/galera_sr/suite.pm @@ -1,16 +1,11 @@ package My::Suite::Galera_sr; -use File::Basename; -use My::Find; -@ISA = qw(My::Suite); - -return "Not run for embedded server" if $::opt_embedded_server; +use lib 'suite'; +use wsrep::common; -return "WSREP is not compiled in" if not ::have_wsrep(); - -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, ( |