mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +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:
@ -4,6 +4,9 @@
|
||||
--source include/long_test.inc
|
||||
|
||||
set global query_cache_type= ON;
|
||||
set @save_query_cache_size=@@global.query_cache_size;
|
||||
SET @save_concurrent_insert= @@GLOBAL.concurrent_insert;
|
||||
|
||||
#
|
||||
# Bug #30887 Server crashes on SET GLOBAL query_cache_size=0
|
||||
#
|
||||
@ -53,9 +56,6 @@ drop table t1;
|
||||
# Bug#41098: Query Cache returns wrong result with concurrent insert
|
||||
#
|
||||
|
||||
SET @old_concurrent_insert= @@GLOBAL.concurrent_insert;
|
||||
SET @old_query_cache_size= @@GLOBAL.query_cache_size;
|
||||
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
--enable_warnings
|
||||
@ -247,8 +247,6 @@ SET GLOBAL query_cache_type= DEFAULT;
|
||||
--echo # Bug#56822: Add a thread state for sessions waiting on the query cache lock
|
||||
--echo #
|
||||
|
||||
SET @old_query_cache_size= @@GLOBAL.query_cache_size;
|
||||
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS t1;
|
||||
--enable_warnings
|
||||
@ -297,7 +295,7 @@ connection default;
|
||||
SET DEBUG_SYNC= 'RESET';
|
||||
RESET QUERY CACHE;
|
||||
DROP TABLE t1;
|
||||
SET GLOBAL query_cache_size= DEFAULT;
|
||||
SET GLOBAL query_cache_size= @save_query_cache_size;
|
||||
SET GLOBAL query_cache_type= DEFAULT;
|
||||
|
||||
--echo #
|
||||
@ -322,16 +320,13 @@ SET GLOBAL query_cache_type= 1;
|
||||
--connect (con2,localhost,root,,test)
|
||||
--connect (con1,localhost,root,,test)
|
||||
set debug_sync="wait_in_query_cache_store_query SIGNAL parked WAIT_FOR go";
|
||||
--send
|
||||
|
||||
SELECT DISTINCT id FROM t1 WHERE id BETWEEN 5603 AND 16218 ORDER BY k;
|
||||
--send SELECT DISTINCT id FROM t1 WHERE id BETWEEN 5603 AND 16218 ORDER BY k
|
||||
|
||||
--connection default
|
||||
|
||||
set debug_sync="now WAIT_FOR parked";
|
||||
--connection con2
|
||||
--send
|
||||
SET GLOBAL query_cache_type= 0;
|
||||
--send SET GLOBAL query_cache_type= 0;
|
||||
|
||||
--connection default
|
||||
set debug_sync="now SIGNAL go";
|
||||
@ -347,7 +342,8 @@ set debug_sync="now SIGNAL go";
|
||||
--connection default
|
||||
set debug_sync= 'RESET';
|
||||
DROP TABLE t1;
|
||||
SEt GLOBAL query_cache_size= DEFAULT;
|
||||
SEt GLOBAL query_cache_type= DEFAULT;
|
||||
SET GLOBAL query_cache_size=@save_query_cache_size;
|
||||
SET GLOBAL query_cache_type= DEFAULT;
|
||||
SET @@GLOBAL.concurrent_insert=@save_concurrent_insert;
|
||||
|
||||
--echo # End of 5.5 tests
|
||||
|
Reference in New Issue
Block a user