diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-04-21 18:07:11 +0200 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-06-17 04:01:47 +0200 |
| commit | 7dd42300154348fc921b9322d2783f379960be10 (patch) | |
| tree | bbefffd427adc666518cebbf75df32d464790b83 /mysql-test/suite/wsrep/suite.pm | |
| parent | fb0d18e4128d82ac92c6024cb9d5e4e3c9a6da98 (diff) | |
| download | mariadb-git-bb-10.2-anel-wsrep.tar.gz | |
MDEV-18565 Galera mtr-suite fails if galera library is not installedbb-10.2-anel-wsrep
revert/simplify f5390eea9a9
remove galera-specific checks from mtr and the main suite
Diffstat (limited to 'mysql-test/suite/wsrep/suite.pm')
| -rw-r--r-- | mysql-test/suite/wsrep/suite.pm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm index 7b3dae7c8c3..2ee33d83275 100644 --- a/mysql-test/suite/wsrep/suite.pm +++ b/mysql-test/suite/wsrep/suite.pm @@ -1,16 +1,11 @@ package My::Suite::WSREP; -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" unless ::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, ( |