Commit 5ef55e2c authored by Nirbhay Choubey's avatar Nirbhay Choubey

Added galera, wsrep suites to the default mtr suite list.

parent 68a0f28d
...@@ -186,6 +186,8 @@ my @DEFAULT_SUITES= qw( ...@@ -186,6 +186,8 @@ my @DEFAULT_SUITES= qw(
sys_vars- sys_vars-
unit- unit-
vcol- vcol-
galera-
wsrep-
); );
my $opt_suites; my $opt_suites;
...@@ -415,6 +417,7 @@ sub main { ...@@ -415,6 +417,7 @@ sub main {
check_ndbcluster_support(); check_ndbcluster_support();
check_ssl_support(); check_ssl_support();
check_debug_support(); check_debug_support();
check_wsrep_support();
mtr_report("Collecting tests..."); mtr_report("Collecting tests...");
my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list); my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list);
...@@ -2396,8 +2399,8 @@ sub environment_setup { ...@@ -2396,8 +2399,8 @@ sub environment_setup {
# ---------------------------------------------------- # ----------------------------------------------------
# Setup env for wsrep # Setup env for wsrep
# ---------------------------------------------------- # ----------------------------------------------------
if (defined $ENV{'WSREP_PROVIDER'} ) if (have_wsrep()) {
{ if (defined $ENV{'WSREP_PROVIDER'} ) {
# Nothing needs to be done! WSREP_PROVIDER env is already set and will be # Nothing needs to be done! WSREP_PROVIDER env is already set and will be
# used. # used.
} else { } else {
...@@ -2406,8 +2409,8 @@ sub environment_setup { ...@@ -2406,8 +2409,8 @@ sub environment_setup {
"/usr/lib64/galera/libgalera_smm.so"); "/usr/lib64/galera/libgalera_smm.so");
$ENV{'WSREP_PROVIDER'}= $file_wsrep_provider; $ENV{'WSREP_PROVIDER'}= $file_wsrep_provider;
} }
mtr_verbose("WSREP_PROVIDER set to $ENV{'WSREP_PROVIDER'}"); mtr_verbose("WSREP_PROVIDER set to $ENV{'WSREP_PROVIDER'}");
}
# ---------------------------------------------------- # ----------------------------------------------------
# mysql clients # mysql clients
...@@ -3172,6 +3175,17 @@ sub ndbcluster_start ($) { ...@@ -3172,6 +3175,17 @@ sub ndbcluster_start ($) {
return 0; return 0;
} }
sub have_wsrep() {
my $wsrep_on= $mysqld_variables{'wsrep-on'};
return defined $wsrep_on
}
sub check_wsrep_support() {
if (have_wsrep())
{
mtr_report(" - binaries built with wsrep patch");
}
}
sub mysql_server_start($) { sub mysql_server_start($) {
my ($mysqld, $tinfo) = @_; my ($mysqld, $tinfo) = @_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment