Updated mtr files to support different compiled in options

This allows one to run the test suite even if any of the following
options are changed:
- character-set-server
- collation-server
- join-cache-level
- log-basename
- max-allowed-packet
- optimizer-switch
- query-cache-size and query-cache-type
- skip-name-resolve
- table-definition-cache
- table-open-cache
- Some innodb options
etc

Changes:
- Don't print out the value of system variables as one can't depend on
  them to being constants.
- Don't set global variables to 'default' as the default may not
  be the same as the test was started with if there was an additional
  option file. Instead save original value and reset it at end of test.
- Test that depends on the latin1 character set should include
  default_charset.inc or set the character set to latin1
- Test that depends on the original optimizer switch, should include
  default_optimizer_switch.inc
- Test that depends on the value of a specific system variable should
  set it in the test (like optimizer_use_condition_selectivity)
- Split subselect3.test into subselect3.test and subselect3.inc to
  make it easier to set and reset system variables.
- Added .opt files for test that required specfic options that could
  be changed by external configuration files.
- Fixed result files in rockdsb & tokudb that had not been updated for
  a while.

1 files changed, 2 insertions, 14 deletions

diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
index 8fe9a0954a3..f9d2b556804 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
@@ -2,18 +2,6 @@ flush status;
 flush hosts;
 flush user_resources;
 flush privileges;
-select @@global.debug;
-@@global.debug
-
-select @@global.max_connect_errors;
-@@global.max_connect_errors
-100
-select @@global.max_user_connections;
-@@global.max_user_connections
-1024
-select @@global.max_connections;
-@@global.max_connections
-151
 select `User`, `Host` from mysql.`user` where `host` like '%\\%%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like '192.%';
@@ -22,8 +10,8 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-select @@global.max_connections into @saved_max_connections;
-select @@global.max_user_connections into @saved_max_user_connections;
+SET @saved_max_connections=@@global.max_connections;
+SET @saved_max_user_connections=@@global.max_user_connections;
 create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'