mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
ca5b1b5431
mysql-test/lib/My/Options.pm:
My::Options::is_set() now matches both option names and values!
mysql-test/lib/mtr_cases.pm:
1. don't merge --plugin-load here, it's too early
2. don't skip combinations that set --plugin-load just because the test needs another --plugin-load.
Skip *only* if test's --plugin-load matches *exactly* --plugin-load of one of the combinations.
3. if skipping all combinations but one, still assign the test to the combination
mysql-test/mysql-test-run.pl:
1. remove dead code - don't set variables that aren't used.
2. bugfix: allow one-letter combination names
3. in the command line, merge all --plugin-load options in one
storage/federated/ha_federated.cc:
bugfix: garbage character in the generated SELECT query
20 lines
550 B
Perl
20 lines
550 B
Perl
package My::Suite::Federated;
|
|
|
|
@ISA = qw(My::Suite);
|
|
|
|
############# initialization ######################
|
|
my @combinations;
|
|
|
|
push @combinations, 'old'
|
|
if $ENV{HA_FEDERATED_SO} and not $::mysqld_variables{'federated'};
|
|
push @combinations, 'X'
|
|
if $ENV{HA_FEDERATEDX_SO} or $::mysqld_variables{'federated'};
|
|
|
|
return "Neither Federated nor FederatedX are available" unless @combinations;
|
|
|
|
$ENV{FEDERATED_COMBINATIONS}=join ':', @combinations
|
|
unless $ENV{FEDERATED_COMBINATIONS};
|
|
|
|
############# return an object ######################
|
|
bless { };
|
|
|