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.

6 files changed, 10 insertions, 4 deletions

diff --git a/mysql-test/suite/plugins/r/qc_info.result b/mysql-test/suite/plugins/r/qc_info.result
index f9192d1dfec..0a20a1a8a5f 100644
--- a/mysql-test/suite/plugins/r/qc_info.result
+++ b/mysql-test/suite/plugins/r/qc_info.result
@@ -1,3 +1,4 @@
+set @save_query_cache_size=@@global.query_cache_size;
 set global query_cache_type=ON;
 set local query_cache_type=ON;
 set global query_cache_size=1355776;
@@ -41,3 +42,4 @@ show query_cache_info;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_info' at line 1
 flush query_cache_info;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_info' at line 1
+set @@global.query_cache_size=@save_query_cache_size;
diff --git a/mysql-test/suite/plugins/r/qc_info_priv.result b/mysql-test/suite/plugins/r/qc_info_priv.result
index 93fee5837f6..c5fcb1f5981 100644
--- a/mysql-test/suite/plugins/r/qc_info_priv.result
+++ b/mysql-test/suite/plugins/r/qc_info_priv.result
@@ -1,3 +1,4 @@
+set @save_query_cache_size=@@global.query_cache_size;
 set global query_cache_type=ON;
 set local query_cache_type=ON;
 set global query_cache_size=1355776;
@@ -43,5 +44,5 @@ count(*)
 connection default;
 drop user mysqltest;
 drop table t1;
-set global query_cache_size= default;
+set @@global.query_cache_size=@save_query_cache_size;
 set global query_cache_type=default;
diff --git a/mysql-test/suite/plugins/t/feedback_plugin_load.test b/mysql-test/suite/plugins/t/feedback_plugin_load.test
index 11a16134135..1f9f837308b 100644
--- a/mysql-test/suite/plugins/t/feedback_plugin_load.test
+++ b/mysql-test/suite/plugins/t/feedback_plugin_load.test
@@ -1,4 +1,4 @@
-if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active'`)
+if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'feedback' and plugin_status='active' and @@feedback_url <> ""`)
 {
   --skip Feedback plugin is not active
 }
diff --git a/mysql-test/suite/plugins/t/qc_info.test b/mysql-test/suite/plugins/t/qc_info.test
index ef759ce8eb4..46184744d7e 100644
--- a/mysql-test/suite/plugins/t/qc_info.test
+++ b/mysql-test/suite/plugins/t/qc_info.test
@@ -1,3 +1,5 @@
+set @save_query_cache_size=@@global.query_cache_size;
+--source include/default_charset.inc
 --source qc_info_init.inc
 
 drop table t1;
@@ -15,3 +17,4 @@ show query_cache_info;
 --error ER_PARSE_ERROR
 flush query_cache_info;
 
+set @@global.query_cache_size=@save_query_cache_size;
diff --git a/mysql-test/suite/plugins/t/qc_info_init.inc b/mysql-test/suite/plugins/t/qc_info_init.inc
index 4f125432876..c3f700f08d0 100644
--- a/mysql-test/suite/plugins/t/qc_info_init.inc
+++ b/mysql-test/suite/plugins/t/qc_info_init.inc
@@ -32,4 +32,3 @@ set time_zone= @time_zone, default_week_format= @default_week_format, character_
 --sorted_result
 --replace_column 5 # 19 # 23 #
 select * from information_schema.query_cache_info;
-
diff --git a/mysql-test/suite/plugins/t/qc_info_priv.test b/mysql-test/suite/plugins/t/qc_info_priv.test
index adcf882be9f..59258731508 100644
--- a/mysql-test/suite/plugins/t/qc_info_priv.test
+++ b/mysql-test/suite/plugins/t/qc_info_priv.test
@@ -1,3 +1,4 @@
+set @save_query_cache_size=@@global.query_cache_size;
 --source include/not_embedded.inc
 --source qc_info_init.inc
 
@@ -11,5 +12,5 @@ connection default;
 drop user mysqltest;
 drop table t1;
 
-set global query_cache_size= default;
+set @@global.query_cache_size=@save_query_cache_size;
 set global query_cache_type=default;