diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-30 11:37:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-30 11:37:28 +0100 |
| commit | ca5b1b54312cf9bc4a8252134874d82cf394eb48 (patch) | |
| tree | 0ef5c3ca94c907d2d83ec1031d50b2cd04a0d544 /mysql-test/lib/My | |
| parent | be505e3ebf843f462173080d6cd0b6e0f5fb6be9 (diff) | |
| download | mariadb-git-ca5b1b54312cf9bc4a8252134874d82cf394eb48.tar.gz | |
test both federated and federatedX in the federated suite.
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
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/Options.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm index 6e8cf7ec919..a0713f7c07e 100644 --- a/mysql-test/lib/My/Options.pm +++ b/mysql-test/lib/My/Options.pm @@ -153,7 +153,7 @@ sub is_set { foreach my $set_opt (@$set_opts){ my ($opt_name2, $value2)= _split_option($set_opt); - if ($opt_name1 eq $opt_name2){ + if ($opt_name1 eq $opt_name2 and $value1 eq $value2){ # Option already set return 1; } |