diff options
author | Monty <monty@mariadb.org> | 2019-08-30 16:06:54 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-09-01 19:17:35 +0300 |
commit | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (patch) | |
tree | 06ccec13687d86b13b0b9d709776ba08f608ba29 /mysql-test/suite/sys_vars/r/character_set_client_basic.result | |
parent | b23b3a5fb621ca7715c3833075eaa65ccd99a219 (diff) | |
download | mariadb-git-9cba6c5aa3b15fffc0ca10e92bcb55a126a20701.tar.gz |
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.
Diffstat (limited to 'mysql-test/suite/sys_vars/r/character_set_client_basic.result')
-rw-r--r-- | mysql-test/suite/sys_vars/r/character_set_client_basic.result | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result index e6502d63c78..2c73d220dd3 100644 --- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result @@ -1,7 +1,5 @@ SET @global_start_value = @@global.character_set_client; -SELECT @global_start_value; -@global_start_value -latin1 +SET @@global.character_set_client=@@character_set_client; SET @session_start_value = @@character_set_client; SELECT @session_start_value; @session_start_value @@ -32,14 +30,14 @@ ERROR 42S22: Unknown column 'global' in 'field list' '#--------------------FN_DYNVARS_010_02-------------------------#' SET @@character_set_client = latin5; SET @@character_set_client = DEFAULT; -SELECT @@character_set_client AS DEFAULT_VALUE; -DEFAULT_VALUE -utf8 +SELECT @@character_set_client = @@global.character_set_client; +@@character_set_client = @@global.character_set_client +1 SET @@global.character_set_client = latin5; SET @@global.character_set_client = DEFAULT; -SELECT @@global.character_set_client; -@@global.character_set_client -latin1 +SELECT @@global.character_set_client= @global_start_value; +@@global.character_set_client= @global_start_value +1 '#--------------------FN_DYNVARS_010_03-------------------------#' SET @@session.character_set_client = utf8; SELECT @@session.character_set_client; @@ -502,10 +500,4 @@ WHERE VARIABLE_NAME='character_set_client') AS res; res 1 SET @@global.character_set_client = @global_start_value; -SELECT @@global.character_set_client; -@@global.character_set_client -latin1 SET @@session.character_set_client = @session_start_value; -SELECT @@session.character_set_client; -@@session.character_set_client -latin1 |