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.

18 files changed, 30 insertions, 4 deletions

diff --git a/mysql-test/suite/funcs_1/datadict/is_routines.inc b/mysql-test/suite/funcs_1/datadict/is_routines.inc
index a6e0931ca42..35b31c35553 100644
--- a/mysql-test/suite/funcs_1/datadict/is_routines.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_routines.inc
@@ -18,6 +18,8 @@
 # 2008-06-11 mleich Move t/is_routines.test to this file and
 #                   create variants for embedded/non embedded server.
 #
+
+--source include/default_charset.inc
 set sql_mode="";
 
 let $engine_type       = MEMORY;
diff --git a/mysql-test/suite/funcs_1/datadict/is_schemata.inc b/mysql-test/suite/funcs_1/datadict/is_schemata.inc
index 18c759b91d1..bbdbbcd44af 100644
--- a/mysql-test/suite/funcs_1/datadict/is_schemata.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_schemata.inc
@@ -18,6 +18,7 @@
 #                   create variants for embedded/non embedded server.
 #
 
+--source include/default_charset.inc
 let $is_table = SCHEMATA;
 
 # The table INFORMATION_SCHEMA.SCHEMATA must exist
diff --git a/mysql-test/suite/funcs_1/datadict/is_tables.inc b/mysql-test/suite/funcs_1/datadict/is_tables.inc
index 2059917247c..b3d0ef4cca5 100644
--- a/mysql-test/suite/funcs_1/datadict/is_tables.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc
@@ -20,6 +20,8 @@
 #                   create variants for embedded/non embedded server.
 #
 
+--source include/default_charset.inc
+
 let $engine_type       = MEMORY;
 let $other_engine_type = MyISAM;
 
diff --git a/mysql-test/suite/funcs_1/datadict/is_triggers.inc b/mysql-test/suite/funcs_1/datadict/is_triggers.inc
index b2ce1e2de00..fdfdad31392 100644
--- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc
+++ b/mysql-test/suite/funcs_1/datadict/is_triggers.inc
@@ -19,6 +19,9 @@
 # 2008-06-11 mleich Move t/is_triggers.test to this file and
 #                   create variants for embedded/non embedded server.
 #
+
+--source include/default_charset.inc
+set @save_sql_mode=@@global.sql_mode;
 set global sql_mode="";
 
 let $engine_type       = MEMORY;
@@ -264,4 +267,5 @@ ALTER TABLE information_schema.triggers RENAME information_schema.xtriggers;
 # Cleanup
 DROP DATABASE db_datadict;
 
-set global sql_mode=default;
+set global sql_mode=@save_sql_mode;
+
diff --git a/mysql-test/suite/funcs_1/datadict/tables.inc b/mysql-test/suite/funcs_1/datadict/tables.inc
index 5c83b11eb66..ad9abc3f4d7 100644
--- a/mysql-test/suite/funcs_1/datadict/tables.inc
+++ b/mysql-test/suite/funcs_1/datadict/tables.inc
@@ -9,6 +9,8 @@
 # 2008-06-04 mleich Create this script based on older scripts and new code.
 #
 
+--source include/default_charset.inc
+
 # Just have some tables within different databases.
 --disable_warnings
 DROP DATABASE IF EXISTS test1;
diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result
index 8e5842742cb..dee6e2a8d52 100644
--- a/mysql-test/suite/funcs_1/r/is_triggers.result
+++ b/mysql-test/suite/funcs_1/r/is_triggers.result
@@ -1,3 +1,4 @@
+set @save_sql_mode=@@global.sql_mode;
 set global sql_mode="";
 SHOW TABLES FROM information_schema LIKE 'TRIGGERS';
 Tables_in_information_schema (TRIGGERS)
@@ -233,4 +234,4 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
 ALTER TABLE information_schema.triggers RENAME information_schema.xtriggers;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 DROP DATABASE db_datadict;
-set global sql_mode=default;
+set global sql_mode=@save_sql_mode;
diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
index 55dc79e50d2..a22b942c158 100644
--- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
@@ -1,3 +1,4 @@
+set @save_sql_mode=@@global.sql_mode;
 set global sql_mode="";
 SHOW TABLES FROM information_schema LIKE 'TRIGGERS';
 Tables_in_information_schema (TRIGGERS)
@@ -230,4 +231,4 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
 ALTER TABLE information_schema.triggers RENAME information_schema.xtriggers;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
 DROP DATABASE db_datadict;
-set global sql_mode=default;
+set global sql_mode=@save_sql_mode;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
index 74ef7f4fbed..ec8bd08c31e 100644
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
@@ -1,5 +1,6 @@
 #### suite/funcs_1/storedproc/storedproc_07.inc
 #
+--source include/default_charset.inc
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 
 # ==============================================================================
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
index 9a693c5b96f..9f0304a34e2 100644
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
@@ -1,5 +1,6 @@
 #### suite/funcs_1/storedproc/storedproc_08.inc
 #
+--source include/default_charset.inc
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 
 # ==============================================================================
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
index 97ea74b9b55..bb6bb3d1d7e 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
@@ -3,6 +3,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 # InnoDB tables should be used
 #
diff --git a/mysql-test/suite/funcs_1/t/is_columns.test b/mysql-test/suite/funcs_1/t/is_columns.test
index 5fb72713742..c167740b72c 100644
--- a/mysql-test/suite/funcs_1/t/is_columns.test
+++ b/mysql-test/suite/funcs_1/t/is_columns.test
@@ -19,6 +19,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 let $engine_type       = MEMORY;
 let $other_engine_type = MyISAM;
diff --git a/mysql-test/suite/funcs_1/t/is_columns_innodb.test b/mysql-test/suite/funcs_1/t/is_columns_innodb.test
index 7d8ca9a3a8e..275c9805871 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_innodb.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_innodb.test
@@ -13,8 +13,9 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
-
 --source include/have_innodb.inc
+--source include/default_charset.inc
+
 let $engine_type= InnoDB;
 --source suite/funcs_1/datadict/datadict_load.inc
 
diff --git a/mysql-test/suite/funcs_1/t/is_columns_memory.test b/mysql-test/suite/funcs_1/t/is_columns_memory.test
index b76325d114a..8ec32895217 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_memory.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_memory.test
@@ -13,6 +13,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 let $engine_type= MEMORY;
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
diff --git a/mysql-test/suite/funcs_1/t/is_columns_myisam.test b/mysql-test/suite/funcs_1/t/is_columns_myisam.test
index 09b5b088489..9b9974044aa 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_myisam.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_myisam.test
@@ -13,6 +13,8 @@
 #
 
 --source include/not_embedded.inc
+--source include/default_charset.inc
+
 let $engine_type= MyISAM;
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
 --source suite/funcs_1/datadict/datadict_load.inc
diff --git a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
index 6b515bc596a..76c0b4974d5 100644
--- a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
+++ b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
@@ -12,6 +12,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 --echo #################################################################################
 --echo # Testcases 3.2.9.2 + 3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_03e.test b/mysql-test/suite/funcs_1/t/memory_trig_03e.test
index fee02fbb3d7..5224143aa2f 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_03e.test
@@ -3,6 +3,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 # Memory tables should be used
 #
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
index 9beb79c2288..280f935b4e2 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
@@ -3,6 +3,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/default_charset.inc
 
 # MyISAM tables should be used
 #
diff --git a/mysql-test/suite/funcs_1/t/storedproc.test b/mysql-test/suite/funcs_1/t/storedproc.test
index 98385d42b22..f5852ea016f 100644
--- a/mysql-test/suite/funcs_1/t/storedproc.test
+++ b/mysql-test/suite/funcs_1/t/storedproc.test
@@ -9,6 +9,8 @@
 #                   - restore global sort_buffer_size after some subtest
 #                  
 ############################################################################
+
+--source include/default_charset.inc
 set sql_mode="";
 
 # Bug#37746 - Arithmetic range ("int") is smaller than expected