1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

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.
This commit is contained in:
Monty
2019-08-30 16:06:54 +03:00
parent b23b3a5fb6
commit 9cba6c5aa3
659 changed files with 11181 additions and 13214 deletions

View File

@ -1,6 +1,7 @@
SET @global_start_value = @@global.collation_database;
SELECT @global_start_value;
@global_start_value
SET @@global.collation_database=@@collation_server;
SELECT @@global.collation_database;
@@global.collation_database
latin1_swedish_ci
SET @session_start_value = @@collation_database;
SELECT @session_start_value;
@ -27,6 +28,7 @@ SET session collation_database=utf8_unicode_ci;
SELECT session collation_database;
ERROR 42S22: Unknown column 'session' in 'field list'
SET global collation_database=utf8_unicode_ci;
set global collation_database=@@collation_server;
SELECT global collation_database;
ERROR 42S22: Unknown column 'global' in 'field list'
'#--------------------FN_DYNVARS_016_02-------------------------#'
@ -35,14 +37,14 @@ SET @@collation_database = DEFAULT;
SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME=DATABASE();
DEFAULT_COLLATION_NAME
latin1_swedish_ci
SELECT @@collation_database AS DEFAULT_VALUE;
DEFAULT_VALUE
latin1_swedish_ci
SELECT @@collation_database = @@global.collation_database;
@@collation_database = @@global.collation_database
1
SET @@global.collation_database = latin1_bin;
SET @@global.collation_database = DEFAULT;
SELECT @@global.collation_database;
@@global.collation_database
latin1_swedish_ci
SELECT length(@@global.collation_database) > 0;
length(@@global.collation_database) > 0
1
'#--------------------FN_DYNVARS_016_03-------------------------#'
SET @@session.collation_database = utf8_polish_ci;
SELECT @@session.collation_database;
@ -1226,10 +1228,4 @@ WHERE VARIABLE_NAME='collation_database') AS res;
res
1
SET @@global.collation_database = @global_start_value;
SELECT @@global.collation_database;
@@global.collation_database
latin1_swedish_ci
SET @@session.collation_database = @session_start_value;
SELECT @@session.collation_database;
@@session.collation_database
latin1_swedish_ci