From ca5b1b54312cf9bc4a8252134874d82cf394eb48 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 30 Nov 2011 11:37:28 +0100 Subject: 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 --- mysql-test/suite/federated/combinations | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mysql-test/suite/federated/combinations (limited to 'mysql-test/suite/federated/combinations') diff --git a/mysql-test/suite/federated/combinations b/mysql-test/suite/federated/combinations new file mode 100644 index 00000000000..18fd5f0d721 --- /dev/null +++ b/mysql-test/suite/federated/combinations @@ -0,0 +1,8 @@ +[old] +--federated +--plugin-load=$HA_FEDERATED_SO + +[X] +--federated +--plugin-load=$HA_FEDERATEDX_SO + -- cgit v1.2.1