allow suite.pm to skip combinations that originate from test/include files.

storage/innobase/handler/handler0alter.cc:
  for NEWDATE key_type says unsigned, thus col->prtype says unsigned,
  but field->flags says signed. Use the same flag for value retrieval
  that was used for value storage.

1 files changed, 8 insertions, 9 deletions

diff --git a/mysql-test/suite/federated/suite.pm b/mysql-test/suite/federated/suite.pm
index 06458b97adc..6b97fd6528e 100644
--- a/mysql-test/suite/federated/suite.pm
+++ b/mysql-test/suite/federated/suite.pm
@@ -2,18 +2,17 @@ package My::Suite::Federated;
 
 @ISA = qw(My::Suite);
 
-############# initialization ######################
-my @combinations;
+sub skip_combinations {
+  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'};
+  push @combinations, 'old'
+     unless $ENV{HA_FEDERATED_SO} and not $::mysqld_variables{'federated'};
+  push @combinations, 'X'
+     unless $ENV{HA_FEDERATEDX_SO} or $::mysqld_variables{'federated'};
 
-return "Neither Federated nor FederatedX are available" unless @combinations;
+  ( 'combinations' => [ @combinations ] )
+}
 
-$ENV{FEDERATED_COMBINATIONS}=join ':', @combinations
-  unless $ENV{FEDERATED_COMBINATIONS};
 
 ############# return an object ######################
 bless { };