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, 9 insertions, 8 deletions

diff --git a/mysql-test/r/variables-notembedded.result b/mysql-test/r/variables-notembedded.result
index a8bf7ecc429..70a068cd802 100644
--- a/mysql-test/r/variables-notembedded.result
+++ b/mysql-test/r/variables-notembedded.result
@@ -33,12 +33,12 @@ ERROR HY000: Variable 'log_slave_updates' is a read only variable
 #
 SHOW VARIABLES like 'relay_log';
 Variable_name	Value
-relay_log	mysqld-relay-bin
+relay_log	XXX-relay-bin
 SELECT @@session.relay_log;
 ERROR HY000: Variable 'relay_log' is a GLOBAL variable
 SELECT @@global.relay_log;
 @@global.relay_log
-mysqld-relay-bin
+XXX-relay-bin
 SET @@session.relay_log= 'x';
 ERROR HY000: Variable 'relay_log' is a read only variable
 SET @@global.relay_log= 'x';
@@ -46,12 +46,12 @@ ERROR HY000: Variable 'relay_log' is a read only variable
 #
 SHOW VARIABLES like 'relay_log_basename';
 Variable_name	Value
-relay_log_basename	MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin
+relay_log_basename	MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin
 SELECT @@session.relay_log_basename;
 ERROR HY000: Variable 'relay_log_basename' is a GLOBAL variable
 SELECT @@global.relay_log_basename;
 @@global.relay_log_basename
-MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin
+MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin
 SET @@session.relay_log_basename= 'x';
 ERROR HY000: Variable 'relay_log_basename' is a read only variable
 SET @@global.relay_log_basename= 'x';
@@ -72,12 +72,12 @@ ERROR HY000: Variable 'log_bin_basename' is a read only variable
 #
 SHOW VARIABLES like 'relay_log_index';
 Variable_name	Value
-relay_log_index	MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin.index
+relay_log_index	MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin.index
 SELECT @@session.relay_log_index;
 ERROR HY000: Variable 'relay_log_index' is a GLOBAL variable
 SELECT @@global.relay_log_index;
 @@global.relay_log_index
-MYSQLTEST_VARDIR/mysqld.1/data/mysqld-relay-bin.index
+MYSQLTEST_VARDIR/mysqld.1/data/XXX-relay-bin.index
 SET @@session.relay_log_index= 'x';
 ERROR HY000: Variable 'relay_log_index' is a read only variable
 SET @@global.relay_log_index= 'x';
@@ -152,6 +152,7 @@ ERROR HY000: Variable 'slave_skip_errors' is a read only variable
 #   ARE NOT BEING HONORED
 #
 CREATE TABLE t1 (a MEDIUMTEXT);
+set @save_max_allowed_packet=@@global.max_allowed_packet, @save_net_buffer_length=@@net_buffer_length;
 SET GLOBAL max_allowed_packet=2048;
 Warnings:
 Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
@@ -170,7 +171,7 @@ connection default;
 disconnect con1;
 SELECT LENGTH(a) FROM t1;
 LENGTH(a)
-SET GLOBAL max_allowed_packet=default;
-SET GLOBAL net_buffer_length=default;
+SET GLOBAL max_allowed_packet=@save_max_allowed_packet;
+SET GLOBAL net_buffer_length=@save_net_buffer_length;
 DROP TABLE t1;
 End of 5.1 tests