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.

4 files changed, 13 insertions, 7 deletions

diff --git a/mysql-test/suite/funcs_2/charset/charset_master.test b/mysql-test/suite/funcs_2/charset/charset_master.test
index 63cd5eb303d..8f3ac64c753 100644
--- a/mysql-test/suite/funcs_2/charset/charset_master.test
+++ b/mysql-test/suite/funcs_2/charset/charset_master.test
@@ -11,6 +11,8 @@
 #          Add checking of prerequisites + minor cleanup                        #
 #################################################################################
 
+set @save_character_set_database= @@character_set_database;
+
 #
 #
 #
@@ -695,5 +697,9 @@ let $coll= utf8_unicode_ci;
 
 }
 
+--echo # Cleanup
+--disable_query_log
 DROP database test;
-CREATE database test;
+let $tmp=`select @save_character_set_database`;
+eval CREATE database test character set $tmp;
+--enable_query_log
diff --git a/mysql-test/suite/funcs_2/r/innodb_charset.result b/mysql-test/suite/funcs_2/r/innodb_charset.result
index 60785d09430..a9434845472 100644
--- a/mysql-test/suite/funcs_2/r/innodb_charset.result
+++ b/mysql-test/suite/funcs_2/r/innodb_charset.result
@@ -1,3 +1,4 @@
+set @save_character_set_database= @@character_set_database;
 DROP TABLE IF EXISTS test.t1;
 SET NAMES armscii8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET armscii8 COLLATE armscii8_bin) ENGINE=InnoDB CHARACTER SET armscii8 COLLATE armscii8_bin;
@@ -119154,5 +119155,4 @@ DFBD	1
 DFBE	1
 DFBF	1
 DROP TABLE IF EXISTS test.t1;
-DROP database test;
-CREATE database test;
+# Cleanup
diff --git a/mysql-test/suite/funcs_2/r/memory_charset.result b/mysql-test/suite/funcs_2/r/memory_charset.result
index 55951e4443e..ae7778f3e48 100644
--- a/mysql-test/suite/funcs_2/r/memory_charset.result
+++ b/mysql-test/suite/funcs_2/r/memory_charset.result
@@ -1,3 +1,4 @@
+set @save_character_set_database= @@character_set_database;
 DROP TABLE IF EXISTS test.t1;
 SET NAMES armscii8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET armscii8 COLLATE armscii8_bin) ENGINE=Memory CHARACTER SET armscii8 COLLATE armscii8_bin;
@@ -119154,5 +119155,4 @@ DFBD	1
 DFBE	1
 DFBF	1
 DROP TABLE IF EXISTS test.t1;
-DROP database test;
-CREATE database test;
+# Cleanup
diff --git a/mysql-test/suite/funcs_2/r/myisam_charset.result b/mysql-test/suite/funcs_2/r/myisam_charset.result
index c4630637177..e1ca3370532 100644
--- a/mysql-test/suite/funcs_2/r/myisam_charset.result
+++ b/mysql-test/suite/funcs_2/r/myisam_charset.result
@@ -1,3 +1,4 @@
+set @save_character_set_database= @@character_set_database;
 DROP TABLE IF EXISTS test.t1;
 SET NAMES armscii8;
 CREATE TABLE test.t1 (a VARCHAR(3) CHARACTER SET armscii8 COLLATE armscii8_bin) ENGINE=MyISAM CHARACTER SET armscii8 COLLATE armscii8_bin;
@@ -119154,5 +119155,4 @@ DFBD	1
 DFBE	1
 DFBF	1
 DROP TABLE IF EXISTS test.t1;
-DROP database test;
-CREATE database test;
+# Cleanup