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, 11 insertions, 10 deletions

diff --git a/mysql-test/README.suites b/mysql-test/README.suites
index d458983b383..1acfee4426f 100644
--- a/mysql-test/README.suites
+++ b/mysql-test/README.suites
@@ -52,7 +52,7 @@ It can also return a string - in this case all tests in the suite
 will be skipped, with this string being printed as a reason.
 
 A suite class can define config_files(), servers(), list_cases(),
-and start_test() methods.
+start_test() methods, and skip_combinations() methods.
 
 A config_files() method returns a list of additional config files (besides
 my.cnf), that this suite needs to be created. For every file it specifies
@@ -89,6 +89,16 @@ to do it.
 A start_test() method starts one test process, by default it will be mysqltest.
 
 See unit suite for an example of list_cases() and start_test() methods.
+
+A skip_combinations() method returns a hash that maps file names
+(where combinations are defined) to a list of combinations that should
+be skipped. For example
+
+  sub skip_combinations { (
+      'combinations' => [ 'mix', 'rpl' ],
+      'inc/many.combinations' => [ 'a', 'bb', 'c' ]
+  ) }
+
 ==========================
 A suite can have my.cnf template file in the suitedir.
 A my.cnf template uses a normal my.cnf syntax - groups, options,
@@ -152,14 +162,5 @@ merged to a my.cnf, but will be added to the command line. Example:
 Such a file will cause every test from the suite to be run twice - once
 with mysqld using --opt1=val1 and the other one with mysqld using
 --opt1=val2 --opt2=$HAVE_SOMETHING
-
-One can limit mtr run to a subset of combinations by setting environment
-variable SUITENAME_COMBINATIONS to the ':'-separated set of combination
-names. E.g.
-
-  RPL_COMBINATIONS=mix:row ./mtr --suite rpl
-
-See innodb suite for an example of how suite.pm may set this variable
-to exclude unsupported configurations.
 ==========================