1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +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

@@ -227,6 +227,7 @@ test/t7_restart#p#p1#sp#s3 Single DEFAULT DEFAULT Dynamic MYSQL_TMP_DIR/alt_dir/
# Shutdown the server and list the tablespace OS files
#
---- MYSQL_DATA_DIR/test
db.opt
t1_restart.frm
t1_restart.ibd
t2_restart.frm
@@ -485,6 +486,7 @@ SUBPARTITION BY HASH (`c1`)
# Shutdown the server and make a backup of a tablespace
#
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.ibd
t5_restart.frm
@@ -588,6 +590,7 @@ ERROR 42S01: Table 't55_restart' already exists
RENAME TABLE t5_restart TO t55_restart;
ERROR HY000: Error on rename of './test/t5_restart' to './test/t55_restart' (errno: 184 "Tablespace already exists")
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.ibd
t5_restart.frm
@@ -684,6 +687,7 @@ SUBPARTITION BY HASH (`c1`)
(SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.ibd
t55_restart.frm
@@ -786,6 +790,7 @@ SUBPARTITION BY HASH (`c1`)
# Move the remote tablespaces to a new location and change the ISL files
#
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.ibd
t55_restart.frm
@@ -816,6 +821,7 @@ t77_restart#p#p1#sp#s3.ibd
# Moving tablespace 't66_restart' from MYSQL_TMP_DIR/alt_dir to MYSQL_TMP_DIR/new_dir
# Moving tablespace 't77_restart' from MYSQL_TMP_DIR/alt_dir to MYSQL_TMP_DIR/new_dir
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.isl
t55_restart.frm
@@ -931,6 +937,7 @@ SUBPARTITION BY HASH (`c1`)
# Move the remote tablespaces back to the default datadir and delete the ISL file.
#
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.isl
t55_restart.frm
@@ -961,6 +968,7 @@ t77_restart#p#p1#sp#s3.ibd
# Moving 't66_restart' from MYSQL_TMP_DIR/new_dir to MYSQL_DATA_DIR
# Moving 't77_restart' from MYSQL_TMP_DIR/new_dir to MYSQL_DATA_DIR
---- MYSQL_DATA_DIR/test
db.opt
t4_restart.frm
t4_restart.ibd
t55_restart.frm