summaryrefslogtreecommitdiff
path: root/storage/mroonga
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-08-30 16:06:54 +0300
committerMonty <monty@mariadb.org>2019-09-01 19:17:35 +0300
commit9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (patch)
tree06ccec13687d86b13b0b9d709776ba08f608ba29 /storage/mroonga
parentb23b3a5fb621ca7715c3833075eaa65ccd99a219 (diff)
downloadmariadb-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 'storage/mroonga')
-rw-r--r--storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc b/storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc
index 1b4e8575122..e29300b5db4 100644
--- a/storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc
+++ b/storage/mroonga/mysql-test/mroonga/include/mroonga/have_mroonga_deinit.inc
@@ -33,4 +33,10 @@ if (!$have_mroonga_storage_engine) {
UNINSTALL PLUGIN mroonga;
}
+# Some test re-creates the test database. Put it back in the
+# original character set
+--source include/default_charset.inc
+disable_query_log;
+drop database test;
+create database test;
enable_query_log;