database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merging changes from maria-5.5-galera and

Browse Source 
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
This commit is contained in:
Nirbhay Choubey
2014-05-22 18:31:04 -04:00
parent 0bf3ed12a5
commit ab4947463e
22 changed files with 425 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mysql-test/mysql-test-run.pl
View File

@ -187,6 +187,8 @@ my @DEFAULT_SUITES= qw(
sys_vars-
unit-
vcol-
galera-
wsrep-
);
my $opt_suites;
@ -412,6 +414,7 @@ sub main {
check_ndbcluster_support();
check_ssl_support();
check_debug_support();
check_wsrep_support();
if (!$opt_suites) {
$opt_suites= join ',', collect_default_suites(@DEFAULT_SUITES);
@ -2397,6 +2400,22 @@ sub environment_setup {
$ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log;
}
# ----------------------------------------------------
# Setup env for wsrep
# ----------------------------------------------------
if (have_wsrep()) {
if (defined $ENV{'WSREP_PROVIDER'} ) {
# Nothing needs to be done! WSREP_PROVIDER env is already set and will be
# used.
} else {
my $file_wsrep_provider=
mtr_file_exists("/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so");
$ENV{'WSREP_PROVIDER'}= $file_wsrep_provider;
}
mtr_verbose("WSREP_PROVIDER set to $ENV{'WSREP_PROVIDER'}");
}
# ----------------------------------------------------
# mysql clients
# ----------------------------------------------------
@ -3174,6 +3193,17 @@ sub ndbcluster_start ($) {
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($) {
my ($mysqld, $tinfo) = @_;