mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +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:
@ -2,8 +2,11 @@ call mtr.add_suppression("Invalid .old.. table or database name");
|
||||
|
||||
# Embedded server doesn't support external clients
|
||||
--source include/not_embedded.inc
|
||||
|
||||
--source include/have_innodb.inc
|
||||
--source include/default_charset.inc
|
||||
|
||||
set @save_character_set_client=@@character_set_client;
|
||||
set @save_collation_connection=@@collation_connection;
|
||||
|
||||
# check that CSV engine was compiled in, as the result of the test
|
||||
# depends on the presence of the log tables (which are CSV-based).
|
||||
@ -136,7 +139,10 @@ drop table t1;
|
||||
SET NAMES utf8;
|
||||
CREATE TABLE `#mysql50#@` (a INT) engine=myisam;
|
||||
SHOW TABLES;
|
||||
SET NAMES DEFAULT;
|
||||
# Safer version of SET NAMES DEFAULT:
|
||||
set @@character_set_client=@save_character_set_client;
|
||||
set @@character_set_results=@save_character_set_client;
|
||||
set @@collation_connection=@save_collation_connection;
|
||||
--echo mysqlcheck --fix-table-names --databases test
|
||||
--exec $MYSQL_CHECK --fix-table-names --databases test
|
||||
SET NAMES utf8;
|
||||
@ -144,7 +150,10 @@ SHOW TABLES;
|
||||
DROP TABLE `@`;
|
||||
|
||||
CREATE TABLE `я` (a INT) engine=myisam;
|
||||
SET NAMES DEFAULT;
|
||||
set @@character_set_client=@save_character_set_client;
|
||||
set @@character_set_results=@save_character_set_client;
|
||||
set @@collation_connection=@save_collation_connection;
|
||||
|
||||
call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
|
||||
--echo mysqlcheck --default-character-set="latin1" --databases test
|
||||
# Error returned depends on platform, replace it with "Table doesn't exist"
|
||||
@ -155,7 +164,9 @@ call mtr.add_suppression("Can't find file: '..test.@003f.frm'");
|
||||
--exec $MYSQL_CHECK --default-character-set="utf8" --databases test
|
||||
SET NAMES utf8;
|
||||
DROP TABLE `я`;
|
||||
SET NAMES DEFAULT;
|
||||
set @@character_set_client=@save_character_set_client;
|
||||
set @@character_set_results=@save_character_set_client;
|
||||
set @@collation_connection=@save_collation_connection;
|
||||
|
||||
CREATE DATABASE `#mysql50#a@b`;
|
||||
USE `#mysql50#a@b`;
|
||||
@ -405,5 +416,6 @@ create table t1(a int);
|
||||
insert into t1 (a) values (1), (2), (3);
|
||||
select * from mysql.column_stats;
|
||||
--exec $MYSQL_CHECK --analyze test t1 --persistent
|
||||
--replace_column 9 # 10 # 11 #
|
||||
select * from mysql.column_stats where db_name = 'test' and table_name = 't1';
|
||||
drop table t1;
|
||||
|
Reference in New Issue
Block a user