Skip to content

M
MariaDB
Commit 0e82fa6c authored by Horst Hunger's avatar Horst Hunger
Browse files
Options

WL#4681: Took the system variable tests out of the main test suite, put them... 

WL#4681: Took the system variable tests out of the main test suite, put them into "sys_vars", updated some reult files and tests.
parent ad41e2e7
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 51 deletions
mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
View file @ 0e82fa6c
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
############################################################################### ###############################################################################
SET @start_value = @@global.query_cache_size; SET @start_value = @@global.query_cache_size;
SELECT @start_value;
--echo '#--------------------FN_DYNVARS_133_01------------------------#' --echo '#--------------------FN_DYNVARS_133_01------------------------#'
############################################################################### ###############################################################################
...@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size; ...@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size;
############################################### ###############################################
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size = 0; SELECT @@global.query_cache_size = @start_value;
--echo '#--------------------FN_DYNVARS_133_03------------------------#' --echo '#--------------------FN_DYNVARS_133_03------------------------#'
################################################################################ ################################################################################
...@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size; ...@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size;
############################## ##############################
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
######################################################################## ########################################################################
# END OF query_cache_size TESTS # # END OF query_cache_size TESTS #
......
mysql-test/suite/sys_vars/inc/timestamp_basic.inc
View file @ 0e82fa6c
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
# * Scope & Access method # # * Scope & Access method #
# * Data Integrity # # * Data Integrity #
# # # #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # # Reference: #
# server-system-variables.html # # http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# # # #
############################################################################### ###############################################################################
...@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999; ...@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999;
# Check if the value in SESSION Table matches value in variable # # Check if the value in SESSION Table matches value in variable #
######################################################################### #########################################################################
SELECT @@timestamp = VARIABLE_VALUE # disabled due to bug#41584
FROM INFORMATION_SCHEMA.SESSION_VARIABLES #SELECT @@timestamp = VARIABLE_VALUE
WHERE VARIABLE_NAME='timestamp'; #FROM INFORMATION_SCHEMA.SESSION_VARIABLES
#WHERE VARIABLE_NAME='timestamp';
--echo '#---------------------FN_DYNVARS_001_08-------------------------#' --echo '#---------------------FN_DYNVARS_001_08-------------------------#'
############################################################################# #############################################################################
......
mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
View file @ 0e82fa6c
SET @start_value = @@global.query_cache_size; SET @start_value = @@global.query_cache_size;
SELECT @start_value;
@start_value
0
'#--------------------FN_DYNVARS_133_01------------------------#' '#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99; SET @@global.query_cache_size = 99;
SET @@global.query_cache_size = DEFAULT; SET @@global.query_cache_size = DEFAULT;
...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size; ...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
0 0
'#---------------------FN_DYNVARS_133_02-------------------------#' '#---------------------FN_DYNVARS_133_02-------------------------#'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size = 0; SELECT @@global.query_cache_size = @start_value;
@@global.query_cache_size = 0 @@global.query_cache_size = @start_value
1 1
'#--------------------FN_DYNVARS_133_03------------------------#' '#--------------------FN_DYNVARS_133_03------------------------#'
SET @@global.query_cache_size = 0; SET @@global.query_cache_size = 0;
...@@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in field list ...@@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_size = @@session.query_cache_size; SELECT query_cache_size = @@session.query_cache_size;
ERROR 42S22: Unknown column 'query_cache_size' in 'field list' ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
View file @ 0e82fa6c
SET @start_value = @@global.query_cache_size; SET @start_value = @@global.query_cache_size;
SELECT @start_value;
@start_value
0
'#--------------------FN_DYNVARS_133_01------------------------#' '#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99; SET @@global.query_cache_size = 99;
SET @@global.query_cache_size = DEFAULT; SET @@global.query_cache_size = DEFAULT;
...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size; ...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
0 0
'#---------------------FN_DYNVARS_133_02-------------------------#' '#---------------------FN_DYNVARS_133_02-------------------------#'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size = 0; SELECT @@global.query_cache_size = @start_value;
@@global.query_cache_size = 0 @@global.query_cache_size = @start_value
1 1
'#--------------------FN_DYNVARS_133_03------------------------#' '#--------------------FN_DYNVARS_133_03------------------------#'
SET @@global.query_cache_size = 0; SET @@global.query_cache_size = 0;
...@@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in field list ...@@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_size = @@session.query_cache_size; SELECT query_cache_size = @@session.query_cache_size;
ERROR 42S22: Unknown column 'query_cache_size' in 'field list' ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
mysql-test/r/rpl_max_binlog_size_func.result → mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
View file @ 0e82fa6c
...@@ -3,3 +3,4 @@ DROP TABLE IF EXISTS t1; ...@@ -3,3 +3,4 @@ DROP TABLE IF EXISTS t1;
SET @@global.max_binlog_size = 4096; SET @@global.max_binlog_size = 4096;
CREATE TABLE t1(a CHAR(5)); CREATE TABLE t1(a CHAR(5));
'mylog.000002 exists' 'mylog.000002 exists'
DROP TABLE t1;
mysql-test/suite/sys_vars/r/timestamp_basic_32.result
View file @ 0e82fa6c
...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp' ...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
SET @@timestamp = 9999999999999999999999; SET @@timestamp = 9999999999999999999999;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
'#----------------------FN_DYNVARS_001_06------------------------#' '#----------------------FN_DYNVARS_001_06------------------------#'
SELECT @@timestamp = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='timestamp';
@@timestamp = VARIABLE_VALUE
1
'#---------------------FN_DYNVARS_001_08-------------------------#' '#---------------------FN_DYNVARS_001_08-------------------------#'
SET @@timestamp = OFF; SET @@timestamp = OFF;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
......
mysql-test/suite/sys_vars/r/timestamp_basic_64.result
View file @ 0e82fa6c
...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp' ...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
SET @@timestamp = 9999999999999999999999; SET @@timestamp = 9999999999999999999999;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
'#----------------------FN_DYNVARS_001_06------------------------#' '#----------------------FN_DYNVARS_001_06------------------------#'
SELECT @@timestamp = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='timestamp';
@@timestamp = VARIABLE_VALUE
1
'#---------------------FN_DYNVARS_001_08-------------------------#' '#---------------------FN_DYNVARS_001_08-------------------------#'
SET @@timestamp = OFF; SET @@timestamp = OFF;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
......
mysql-test/t/character_set_client_basic.test → mysql-test/suite/sys_vars/t/character_set_client_basic.test
View file @ 0e82fa6c
...@@ -207,7 +207,7 @@ SELECT @@character_set_client; ...@@ -207,7 +207,7 @@ SELECT @@character_set_client;
let charset_variable = @@global.character_set_client; let charset_variable = @@global.character_set_client;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_010_08-------------------------#' --echo '#--------------------FN_DYNVARS_010_08-------------------------#'
################################################################################ ################################################################################
......
mysql-test/t/character_set_connection_basic.test → mysql-test/suite/sys_vars/t/character_set_connection_basic.test
View file @ 0e82fa6c
...@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 + latin2; ...@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 + latin2;
############################################################################## ##############################################################################
let charset_variable = @@session.character_set_connection; let charset_variable = @@session.character_set_connection;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_011_07-------------------------#' --echo '#--------------------FN_DYNVARS_011_07-------------------------#'
...@@ -131,7 +131,7 @@ let charset_variable = @@session.character_set_connection; ...@@ -131,7 +131,7 @@ let charset_variable = @@session.character_set_connection;
############################################################################## ##############################################################################
let charset_variable = @@global.character_set_connection; let charset_variable = @@global.character_set_connection;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_011_08-------------------------#' --echo '#--------------------FN_DYNVARS_011_08-------------------------#'
......
mysql-test/t/character_set_database_basic.test → mysql-test/suite/sys_vars/t/character_set_database_basic.test
View file @ 0e82fa6c
...@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + latin2; ...@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + latin2;
############################################################################# #############################################################################
let charset_variable = @@session.character_set_database; let charset_variable = @@session.character_set_database;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_012_07-------------------------#' --echo '#--------------------FN_DYNVARS_012_07-------------------------#'
...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_database; ...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_database;
############################################################################## ##############################################################################
let charset_variable = @@global.character_set_database; let charset_variable = @@global.character_set_database;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_012_08-------------------------#' --echo '#--------------------FN_DYNVARS_012_08-------------------------#'
......
mysql-test/t/character_set_filesystem_basic.test → mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
View file @ 0e82fa6c
...@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 + latin2; ...@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 + latin2;
############################################################################### ###############################################################################
let charset_variable = @@session.character_set_filesystem; let charset_variable = @@session.character_set_filesystem;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_008_07-------------------------#' --echo '#--------------------FN_DYNVARS_008_07-------------------------#'
...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_filesystem; ...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_filesystem;
############################################################################## ##############################################################################
let charset_variable = @@global.character_set_filesystem; let charset_variable = @@global.character_set_filesystem;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_008_08-------------------------#' --echo '#--------------------FN_DYNVARS_008_08-------------------------#'
......
mysql-test/t/character_set_results_basic.test → mysql-test/suite/sys_vars/t/character_set_results_basic.test
View file @ 0e82fa6c
...@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + latin2; ...@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + latin2;
############################################################################## ##############################################################################
let charset_variable = @@session.character_set_results; let charset_variable = @@session.character_set_results;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_013_07-------------------------#' --echo '#--------------------FN_DYNVARS_013_07-------------------------#'
...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_results; ...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_results;
############################################################################### ###############################################################################
let charset_variable = @@global.character_set_results; let charset_variable = @@global.character_set_results;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_013_08-------------------------#' --echo '#--------------------FN_DYNVARS_013_08-------------------------#'
......
mysql-test/t/character_set_server_basic.test → mysql-test/suite/sys_vars/t/character_set_server_basic.test
View file @ 0e82fa6c
...@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + latin2; ...@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + latin2;
let charset_variable = @@session.character_set_server; let charset_variable = @@session.character_set_server;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_009_07-------------------------#' --echo '#--------------------FN_DYNVARS_009_07-------------------------#'
...@@ -132,7 +132,7 @@ let charset_variable = @@session.character_set_server; ...@@ -132,7 +132,7 @@ let charset_variable = @@session.character_set_server;
############################################################################### ###############################################################################
let charset_variable = @@global.character_set_server; let charset_variable = @@global.character_set_server;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_009_08-------------------------#' --echo '#--------------------FN_DYNVARS_009_08-------------------------#'
......
mysql-test/t/collation_connection_basic.test → mysql-test/suite/sys_vars/t/collation_connection_basic.test
View file @ 0e82fa6c
...@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_general_ci + latin7_general_cs; ...@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_general_ci + latin7_general_cs;
############################################################################### ###############################################################################
let collation_variable = @@session.collation_connection; let collation_variable = @@session.collation_connection;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_07-------------------------#' --echo '#--------------------FN_DYNVARS_015_07-------------------------#'
...@@ -131,7 +131,7 @@ let collation_variable = @@session.collation_connection; ...@@ -131,7 +131,7 @@ let collation_variable = @@session.collation_connection;
############################################################################### ###############################################################################
let collation_variable = @@global.collation_connection; let collation_variable = @@global.collation_connection;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_08-------------------------#' --echo '#--------------------FN_DYNVARS_015_08-------------------------#'
......
mysql-test/t/collation_database_basic.test → mysql-test/suite/sys_vars/t/collation_database_basic.test
View file @ 0e82fa6c
...@@ -121,7 +121,7 @@ SET @@collation_database = latin7_general_ci + latin7_general_cs; ...@@ -121,7 +121,7 @@ SET @@collation_database = latin7_general_ci + latin7_general_cs;
########################################################################### ###########################################################################
let collation_variable = @@session.collation_database; let collation_variable = @@session.collation_database;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_07-------------------------#' --echo '#--------------------FN_DYNVARS_016_07-------------------------#'
...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_database; ...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_database;
############################################################################### ###############################################################################
let collation_variable = @@global.collation_database; let collation_variable = @@global.collation_database;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_08-------------------------#' --echo '#--------------------FN_DYNVARS_016_08-------------------------#'
......
mysql-test/t/collation_server_basic.test → mysql-test/suite/sys_vars/t/collation_server_basic.test
View file @ 0e82fa6c
...@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_ci + latin7_general_cs; ...@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_ci + latin7_general_cs;
############################################################################## ##############################################################################
let collation_variable = @@session.collation_server; let collation_variable = @@session.collation_server;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_07-------------------------#' --echo '#--------------------FN_DYNVARS_014_07-------------------------#'
...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_server; ...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_server;
############################################################################# #############################################################################
let collation_variable = @@global.collation_server; let collation_variable = @@global.collation_server;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_08-------------------------#' --echo '#--------------------FN_DYNVARS_014_08-------------------------#'
......
mysql-test/t/rpl_max_binlog_size_func.test → mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
View file @ 0e82fa6c
...@@ -32,6 +32,7 @@ dec $a; ...@@ -32,6 +32,7 @@ dec $a;
--echo 'mylog.000002 exists' --echo 'mylog.000002 exists'
DROP TABLE t1;
############################################################################### ###############################################################################
# End of functionality testing for max_binlog_size # # End of functionality testing for max_binlog_size #
############################################################################### ###############################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7