Skip to content

Commit

Permalink
Search for galera libraries also in /usr/lib64/galera-3
Browse files Browse the repository at this point in the history 
This is where Codership's offical rpm's puts them
  • Loading branch information
@montywi
montywi committed Dec 8, 2017
1 parent c458173 commit 68cd543
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
6 changes: 4 additions & 2 deletions mysql-test/suite/galera/suite.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ return "Not run for embedded server" if $::opt_embedded_server;
return "WSREP is not compiled in" unless defined $::mysqld_variables{'wsrep-on'};

my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER},
"/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so";
"/usr/lib64/galera-3/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so",
"/usr/lib/galera-3/libgalera_smm.so",
"/usr/lib/galera/libgalera_smm.so";

return "No wsrep provider library" unless -f $provider;

Expand Down
6 changes: 4 additions & 2 deletions mysql-test/suite/galera_3nodes/suite.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ return "Not run for embedded server" if $::opt_embedded_server;
return "WSREP is not compiled in" unless defined $::mysqld_variables{'wsrep-on'};

my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER},
"/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so";
"/usr/lib64/galera-3/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so",
"/usr/lib/galera-3/libgalera_smm.so",
"/usr/lib/galera/libgalera_smm.so";

return "No wsrep provider library" unless -f $provider;

Expand Down
6 changes: 4 additions & 2 deletions mysql-test/suite/wsrep/suite.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ return "Not run for embedded server" if $::opt_embedded_server;
return "WSREP is not compiled in" unless defined $::mysqld_variables{'wsrep-on'};

my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER},
"/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so";
"/usr/lib64/galera-3/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so",
"/usr/lib/galera-3/libgalera_smm.so",
"/usr/lib/galera/libgalera_smm.so";

return "No wsrep provider library" unless -f $provider;

Expand Down
6 changes: 4 additions & 2 deletions plugin/wsrep_info/mysql-test/wsrep_info/suite.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ return "Not run for embedded server" if $::opt_embedded_server;
return "WSREP is not compiled in" unless defined $::mysqld_variables{'wsrep-on'};

my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER},
"/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so";
"/usr/lib64/galera-3/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so",
"/usr/lib/galera-3/libgalera_smm.so",
"/usr/lib/galera/libgalera_smm.so";

return "No wsrep provider library" unless -f $provider;

Expand Down

0 comments on commit 68cd543

Please sign in to comment.