database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merged revision 3471, 3472 & 3473 from maria-5.5-galera.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-03-28 08:26:08 -04:00
parent 02ba2bfdb4 a500865c13
commit 9d2e90f379
34 changed files with 624 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/lib/mtr_cases.pm
View File

@ -862,6 +862,8 @@ sub collect_one_test_case {
# Suite has no config, autodetect which one to use
if ($tinfo->{rpl_test}) {
$config= "suite/rpl/my.cnf";
} elsif ($tinfo->{galera_test}) {
$config= "suite/galera/my.cnf";
} else {
$config= "include/default_my.cnf";
}
@ -982,6 +984,7 @@ my $tags_map= {'big_test' => ['big_test', 1],
'master-slave' => ['rpl_test', 1],
'ndb_master-slave' => ['rpl_test', 1, 'ndb_test', 1],
'long_test' => ['long_test', 1],
'galera_init' => ['galera_test', 1],
};
my $tags_regex_string= join('|', keys %$tags_map);
my $tags_regex= qr:include/($tags_regex_string)\.inc:o;