diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/t')
48 files changed, 210 insertions, 343 deletions
diff --git a/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test index 172787d793a..c0d640d5985 100644 --- a/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test +++ b/mysql-test/suite/sys_vars/t/aria_pagecache_buffer_size_basic.test @@ -4,12 +4,16 @@ # # show the global and session values; # -select @@global.aria_pagecache_buffer_size; +select @@global.aria_pagecache_buffer_size > 0; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.aria_pagecache_buffer_size; +--replace_column 2 # show global variables like 'aria_pagecache_buffer_size'; +--replace_column 2 # show session variables like 'aria_pagecache_buffer_size'; +--replace_column 2 # select * from information_schema.global_variables where variable_name='aria_pagecache_buffer_size'; +--replace_column 2 # select * from information_schema.session_variables where variable_name='aria_pagecache_buffer_size'; # diff --git a/mysql-test/suite/sys_vars/t/aria_recover_options_basic.test b/mysql-test/suite/sys_vars/t/aria_recover_options_basic.test index f621998b501..c4060045990 100644 --- a/mysql-test/suite/sys_vars/t/aria_recover_options_basic.test +++ b/mysql-test/suite/sys_vars/t/aria_recover_options_basic.test @@ -2,6 +2,7 @@ --source include/have_maria.inc SET @start_global_value = @@global.aria_recover_options; +set @@global.aria_recover_options=default; # # exists as global only diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test index da098fc3495..45018914ebc 100644 --- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test @@ -1,27 +1,27 @@ -################# mysql-test\t\binlog_cache_size_basic.test #################### -# # -# Variable Name: binlog_cache_size # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 32768 # -# Range: 4096 - 4294967295 # -# # -# # -# Creation Date: 2008-04-28 # -# Author: Salman Rawala/Horst Hunger # -# # -# Description: Test Cases of Dynamic System Variable "binlog_cache_size" # -# that checks behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity . # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_binlog_cache_size # -# # -################################################################################ +################ mysql-test\t\binlog_cache_size_basic.test #################### + # +# Variable Name: binlog_cache_size # +# Scope: GLOBAL # +# Access Type: Dynamic # +# Data Type: Numeric # +# Default Value: 32768 # +# Range: 4096 - 4294967295 # +# # +# # +# Creation Date: 2008-04-28 # +# Author: Salman Rawala/Horst Hunger # +# # +# Description: Test Cases of Dynamic System Variable "binlog_cache_size" # +# that checks behavior of this variable in the following ways # +# * Default Value # +# * Valid & Invalid values # +# * Scope & Access method # +# * Data Integrity . # +# # +# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # +# server-system-variables.html#option_mysqld_binlog_cache_size # +# # +############################################################################### ################################################################# # START OF binlog_cache_size TESTS # @@ -32,7 +32,8 @@ ######################################################################### SET @start_value = @@global.binlog_cache_size; -SELECT @start_value; +set @@global.binlog_cache_size= default; +SELECT @@global.binlog_cache_size; --echo '#--------------------FN_DYNVARS_006_01------------------------#' ######################################################################### @@ -49,7 +50,7 @@ SELECT @@global.binlog_cache_size; # Verify default value of variable # ############################################### -SET @@global.binlog_cache_size = @start_value; +SET @@global.binlog_cache_size = default; SELECT @@global.binlog_cache_size = 32768; @@ -145,8 +146,6 @@ SELECT binlog_cache_size = @@session.binlog_cache_size; ############################## SET @@global.binlog_cache_size = @start_value; -SELECT @@global.binlog_cache_size; - ########################################################### # END OF binlog_cache_size TESTS # diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test index 5c74c6fe8fe..d6ae35ca9c0 100644 --- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test +++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test @@ -1,27 +1,27 @@ -################ mysql-test\t\binlog_stmt_cache_size_basic.test ################ -# # -# Variable Name: binlog_stmt_cache_size # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 32768 # -# Range: 4096 - 4294967295 # -# # -# # -# Creation Date: 2010-10-12 # -# Author: Alfranio Correia # -# # -# Description: Test Cases of Dynamic System Variable "binlog_stmt_cache_size" # -# that checks behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity . # -# # -# Reference: http://dev.mysql.com/doc/refman/5.5/en/ # -# server-system-variables.html#option_mysqld_binlog_stmt_cache_size # -# # -################################################################################ +################ mysql-test\t\binlog_stmt_cache_size_basic.test ############### +# # +# Variable Name: binlog_stmt_cache_size # +# Scope: GLOBAL # +# Access Type: Dynamic # +# Data Type: Numeric # +# Default Value: 32768 # +# Range: 4096 - 4294967295 # +# # +# # +# Creation Date: 2010-10-12 # +# Author: Alfranio Correia # +# # +# Description: Test Cases of Dynamic System Variable "binlog_stmt_cache_size" # +# that checks behavior of this variable in the following ways # +# * Default Value # +# * Valid & Invalid values # +# * Scope & Access method # +# * Data Integrity . # +# # +# Reference: http://dev.mysql.com/doc/refman/5.5/en/ # +# server-system-variables.html#option_mysqld_binlog_stmt_cache_size # +# # +############################################################################### ################################################################# # START OF binlog_stmt_cache_size TESTS # @@ -32,7 +32,8 @@ ######################################################################### SET @start_value = @@global.binlog_stmt_cache_size; -SELECT @start_value; +set @@global.binlog_stmt_cache_size=default; +SELECT @@global.binlog_stmt_cache_size; --echo '#--------------------FN_DYNVARS_006_01------------------------#' ######################################################################### @@ -49,7 +50,7 @@ SELECT @@global.binlog_stmt_cache_size; # Verify default value of variable # ############################################### -SET @@global.binlog_stmt_cache_size = @start_value; +SET @@global.binlog_stmt_cache_size = default; SELECT @@global.binlog_stmt_cache_size = 32768; @@ -145,7 +146,6 @@ SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size; ############################## SET @@global.binlog_stmt_cache_size = @start_value; -SELECT @@global.binlog_stmt_cache_size; ########################################################### diff --git a/mysql-test/suite/sys_vars/t/character_set_client_basic.test b/mysql-test/suite/sys_vars/t/character_set_client_basic.test index d8ae6a81444..e3461e4ac77 100644 --- a/mysql-test/suite/sys_vars/t/character_set_client_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_client_basic.test @@ -30,8 +30,9 @@ --source include/have_utf8mb4.inc --source include/have_utf16.inc --source include/have_utf32.inc - +--source include/default_charset.inc --source include/load_sysvars.inc + ################################################### ## START OF character_set_client TESTS ## ################################################### @@ -40,7 +41,7 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.character_set_client; -SELECT @global_start_value; +SET @@global.character_set_client=@@character_set_client; # Save initial session value SET @session_start_value = @@character_set_client; SELECT @session_start_value; @@ -78,11 +79,11 @@ SELECT global character_set_client; ############################################################################### SET @@character_set_client = latin5; SET @@character_set_client = DEFAULT; -SELECT @@character_set_client AS DEFAULT_VALUE; +SELECT @@character_set_client = @@global.character_set_client; SET @@global.character_set_client = latin5; SET @@global.character_set_client = DEFAULT; -SELECT @@global.character_set_client; +SELECT @@global.character_set_client= @global_start_value; --echo '#--------------------FN_DYNVARS_010_03-------------------------#' ############################################################################### @@ -335,9 +336,7 @@ SELECT @@session.character_set_client = # Restore initial value # #################################### SET @@global.character_set_client = @global_start_value; -SELECT @@global.character_set_client; SET @@session.character_set_client = @session_start_value; -SELECT @@session.character_set_client; ############################################################# # END OF character_set_client TESTS # diff --git a/mysql-test/suite/sys_vars/t/character_set_connection_basic.test b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test index bb63ff8db6a..5d6412dd420 100644 --- a/mysql-test/suite/sys_vars/t/character_set_connection_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test @@ -30,7 +30,7 @@ --source include/have_utf8mb4.inc --source include/have_utf16.inc --source include/have_utf32.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################### ## START OF character_set_connection TESTS ## @@ -40,7 +40,8 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.character_set_connection; -SELECT @global_start_value; +SET @save_character_set_client=@@global.character_set_client; +SET @@global.character_set_client=@@character_set_client; # Save initial session value SET @session_start_value = @@character_set_connection; SELECT @session_start_value; @@ -78,11 +79,11 @@ SELECT global character_set_connection; ############################################################################### SET @@character_set_connection = latin5; SET @@character_set_connection = DEFAULT; -SELECT @@character_set_connection AS DEFAULT_VALUE; +SELECT @@character_set_connection = @@global.character_set_connection; SET @@global.character_set_connection = latin5; SET @@global.character_set_connection = DEFAULT; -SELECT @@global.character_set_connection; +SELECT @@global.character_set_connection = @global_start_value; --echo '#--------------------FN_DYNVARS_011_03-------------------------#' ############################################################################### @@ -262,9 +263,7 @@ SELECT @@session.character_set_connection = # Restore initial value # #################################### SET @@global.character_set_connection = @global_start_value; -SELECT @@global.character_set_connection; -SET @@session.character_set_connection = @session_start_value; -SELECT @@session.character_set_connection; +SET @@global.character_set_client = @save_character_set_client; ############################################################# # END OF character_set_connection TESTS # diff --git a/mysql-test/suite/sys_vars/t/character_set_database_basic.test b/mysql-test/suite/sys_vars/t/character_set_database_basic.test index f3a1ee45de0..54ccc5afddb 100644 --- a/mysql-test/suite/sys_vars/t/character_set_database_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_database_basic.test @@ -30,7 +30,7 @@ --source include/have_utf8mb4.inc --source include/have_utf16.inc --source include/have_utf32.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################### ## START OF character_set_database TESTS ## @@ -40,7 +40,8 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.character_set_database; -SELECT @global_start_value; +SET @@global.character_set_database=@@character_set_client; +SELECT @@global.character_set_database; # Save initial session value SET @session_start_value = @@character_set_database; SELECT @session_start_value; @@ -263,9 +264,7 @@ SELECT @@session.character_set_database = # Restore initial value # #################################### SET @@global.character_set_database = @global_start_value; -SELECT @@global.character_set_database; SET @@session.character_set_database = @session_start_value; -SELECT @@session.character_set_database; ############################################################# # END OF character_set_database TESTS # diff --git a/mysql-test/suite/sys_vars/t/character_set_results_basic.test b/mysql-test/suite/sys_vars/t/character_set_results_basic.test index 5472cd1509e..cca2277713e 100644 --- a/mysql-test/suite/sys_vars/t/character_set_results_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_results_basic.test @@ -30,7 +30,7 @@ --source include/have_utf8mb4.inc --source include/have_utf16.inc --source include/have_utf32.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################ ## START OF character_set_results TESTS ## @@ -40,7 +40,8 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.character_set_results; -SELECT @global_start_value; +SET @@global.character_set_results=@@character_set_client; +SELECT @@global.character_set_results; # Save initial session value SET @session_start_value = @@character_set_results; SELECT @session_start_value; @@ -77,11 +78,11 @@ SELECT global character_set_results; ############################################################################### SET @@character_set_results = latin5; SET @@character_set_results = DEFAULT; -SELECT @@character_set_results AS DEFAULT_VALUE; +SELECT @@character_set_results = @@global.character_set_results; SET @@global.character_set_results = latin5; SET @@global.character_set_results = DEFAULT; -SELECT @@global.character_set_results; +SELECT @@global.character_set_results= @global_start_value; --echo '#--------------------FN_DYNVARS_013_03-------------------------#' ############################################################################### @@ -262,9 +263,7 @@ SELECT @@session.character_set_results = # Restore initial value # #################################### SET @@global.character_set_results = @global_start_value; -SELECT @@global.character_set_results; SET @@session.character_set_results = @session_start_value; -SELECT @@session.character_set_results; ############################################################# # END OF character_set_results TESTS # diff --git a/mysql-test/suite/sys_vars/t/character_set_server_basic.test b/mysql-test/suite/sys_vars/t/character_set_server_basic.test index adb80fcfffd..de090348307 100644 --- a/mysql-test/suite/sys_vars/t/character_set_server_basic.test +++ b/mysql-test/suite/sys_vars/t/character_set_server_basic.test @@ -27,7 +27,7 @@ --source include/have_sjis.inc --source include/have_utf8.inc --source include/have_ucs2.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################### @@ -38,7 +38,8 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.character_set_server; -SELECT @global_start_value; +SET @@global.character_set_server=@@character_set_client; +SELECT @@global.character_set_server; # Save initial session value SET @session_start_value = @@character_set_server; SELECT @session_start_value; @@ -78,11 +79,11 @@ SET @@character_set_server = null; ############################################################################### SET @@character_set_server = latin5; SET @@character_set_server = DEFAULT; -SELECT @@character_set_server AS DEFAULT_VALUE; +SELECT @@character_set_server = @@global.character_set_server; SET @@global.character_set_server = latin5; SET @@global.character_set_server = DEFAULT; -SELECT @@global.character_set_server; +SELECT @@global.character_set_server = @global_start_value; --echo '#--------------------FN_DYNVARS_009_03-------------------------#' ############################################################################### @@ -257,9 +258,7 @@ SELECT @@session.character_set_server = # Restore initial value # #################################### SET @@global.character_set_server = @global_start_value; -SELECT @@global.character_set_server; SET @@session.character_set_server = @session_start_value; -SELECT @@session.character_set_server; ############################################################# # END OF character_set_server TESTS # diff --git a/mysql-test/suite/sys_vars/t/character_set_server_func.test b/mysql-test/suite/sys_vars/t/character_set_server_func.test index 183f87c2ba7..f96c725e1cb 100644 --- a/mysql-test/suite/sys_vars/t/character_set_server_func.test +++ b/mysql-test/suite/sys_vars/t/character_set_server_func.test @@ -45,9 +45,11 @@ connection default; #character set and collation are not specified in CREATE DATABASE statements. #============================================================================== ---echo '---global character_set_server should not effects current connection---' +--echo '--global character_set_server should not effects current connection--' #============================================================================== +--source include/default_charset.inc +select @@character_set_database=@@character_set_connection; SET @@global.character_set_server = utf8; CREATE DATABASE db1; USE db1; diff --git a/mysql-test/suite/sys_vars/t/collation_connection_basic.test b/mysql-test/suite/sys_vars/t/collation_connection_basic.test index 963eadbbcbd..04eae1d8645 100644 --- a/mysql-test/suite/sys_vars/t/collation_connection_basic.test +++ b/mysql-test/suite/sys_vars/t/collation_connection_basic.test @@ -27,7 +27,7 @@ --source include/have_sjis.inc --source include/have_utf8.inc --source include/have_ucs2.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################### @@ -38,7 +38,8 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.collation_connection; -SELECT @global_start_value; +SET @@global.collation_connection=@@collation_connection; +SELECT @@global.collation_connection; # Save initial session value SET @session_start_value = @@collation_connection; SELECT @session_start_value; @@ -75,11 +76,11 @@ SELECT global collation_connection; ############################################################################### SET @@collation_connection = latin1_bin; SET @@collation_connection = DEFAULT; -SELECT @@collation_connection AS DEFAULT_VALUE; +SELECT @@collation_connection = @@global.collation_connection; SET @@global.collation_connection = latin1_bin; SET @@global.collation_connection = DEFAULT; -SELECT @@global.collation_connection; +SELECT @@global.collation_connection = @global_start_value; --echo '#--------------------FN_DYNVARS_015_03-------------------------#' ############################################################################## @@ -253,9 +254,7 @@ SELECT @@session.collation_connection = # Restore initial value # #################################### SET @@global.collation_connection = @global_start_value; -SELECT @@global.collation_connection; SET @@session.collation_connection = @session_start_value; -SELECT @@session.collation_connection; ############################################################# # END OF collation_connection TESTS # diff --git a/mysql-test/suite/sys_vars/t/collation_database_basic.test b/mysql-test/suite/sys_vars/t/collation_database_basic.test index 04aee789746..314331a7999 100644 --- a/mysql-test/suite/sys_vars/t/collation_database_basic.test +++ b/mysql-test/suite/sys_vars/t/collation_database_basic.test @@ -22,12 +22,13 @@ # server-system-variables.html # # # ############################################################################### + --source include/have_big5.inc --source include/have_ujis.inc --source include/have_sjis.inc --source include/have_utf8.inc --source include/have_ucs2.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################### @@ -38,7 +39,8 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.collation_database; -SELECT @global_start_value; +SET @@global.collation_database=@@collation_server; +SELECT @@global.collation_database; # Save initial session value SET @session_start_value = @@collation_database; SELECT @session_start_value; @@ -66,6 +68,7 @@ SET session collation_database=utf8_unicode_ci; SELECT session collation_database; # using another syntax for accessing dynamic variable SET global collation_database=utf8_unicode_ci; +set global collation_database=@@collation_server; --Error ER_BAD_FIELD_ERROR SELECT global collation_database; @@ -76,11 +79,13 @@ SELECT global collation_database; SET @@collation_database = latin1_bin; SET @@collation_database = DEFAULT; SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME=DATABASE(); -SELECT @@collation_database AS DEFAULT_VALUE; +SELECT @@collation_database = @@global.collation_database; SET @@global.collation_database = latin1_bin; SET @@global.collation_database = DEFAULT; -SELECT @@global.collation_database; +# collation_database is depending on how the 'test' database was created, so +# we can't trust it's value. +SELECT length(@@global.collation_database) > 0; --echo '#--------------------FN_DYNVARS_016_03-------------------------#' ############################################################################## @@ -253,9 +258,7 @@ SELECT @@session.collation_database = # Restore initial value # #################################### SET @@global.collation_database = @global_start_value; -SELECT @@global.collation_database; SET @@session.collation_database = @session_start_value; -SELECT @@session.collation_database; ########################################################### # END OF collation_database TESTS # diff --git a/mysql-test/suite/sys_vars/t/collation_database_func.test b/mysql-test/suite/sys_vars/t/collation_database_func.test index 2914d8a07d3..eead98942f1 100644 --- a/mysql-test/suite/sys_vars/t/collation_database_func.test +++ b/mysql-test/suite/sys_vars/t/collation_database_func.test @@ -47,8 +47,6 @@ connection default; DROP TABLE IF EXISTS t1,t2; --enable_warnings - -SELECT @@character_set_server,@@collation_server; #============================================================================== --echo '--check if setting collation_database update character_set_database--' #============================================================================== diff --git a/mysql-test/suite/sys_vars/t/collation_server_basic.test b/mysql-test/suite/sys_vars/t/collation_server_basic.test index b8c2a25fc46..f27a9a185c4 100644 --- a/mysql-test/suite/sys_vars/t/collation_server_basic.test +++ b/mysql-test/suite/sys_vars/t/collation_server_basic.test @@ -27,7 +27,7 @@ --source include/have_sjis.inc --source include/have_utf8.inc --source include/have_ucs2.inc - +--source include/default_charset.inc --source include/load_sysvars.inc ################################################### @@ -38,7 +38,7 @@ # Save initial value # ############################################################# SET @global_start_value = @@global.collation_server; -SELECT @global_start_value; +SET @@global.collation_server= @@collation_server; # Save initial session value SET @session_start_value = @@collation_server; SELECT @session_start_value; @@ -75,11 +75,11 @@ SELECT global collation_server; ############################################################################### SET @@collation_server = latin1_bin; SET @@collation_server = DEFAULT; -SELECT @@collation_server AS DEFAULT_VALUE; +SELECT @@collation_server= @@global.collation_server; SET @@global.collation_server = latin1_bin; SET @@global.collation_server = DEFAULT; -SELECT @@global.collation_server; +SELECT @@global.collation_server = @global_start_value; --echo '#--------------------FN_DYNVARS_014_03-------------------------#' ########################################################################### @@ -254,9 +254,7 @@ SELECT @@session.collation_server = # Restore initial value # #################################### SET @@global.collation_server = @global_start_value; -SELECT @@global.collation_server; SET @@session.collation_server = @session_start_value; -SELECT @@session.collation_server; ##################################################### # END OF collation_server TESTS # diff --git a/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test index fa57cec38c6..f95c7c55f6e 100644 --- a/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test +++ b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test @@ -36,7 +36,6 @@ ######################################################################## SET @start_value = @@global.expire_logs_days; -SELECT @start_value; --echo '#--------------------FN_DYNVARS_029_01------------------------#' @@ -46,7 +45,7 @@ SELECT @start_value; SET @@global.expire_logs_days = 99; SET @@global.expire_logs_days = DEFAULT; -SELECT @@global.expire_logs_days; +SELECT @@global.expire_logs_days = 0; --echo '#---------------------FN_DYNVARS_029_02-------------------------#' @@ -55,7 +54,7 @@ SELECT @@global.expire_logs_days; ############################################### SET @@global.expire_logs_days = @start_value; -SELECT @@global.expire_logs_days = 0; +SELECT @@global.expire_logs_days = @start_value; --echo '#--------------------FN_DYNVARS_029_03------------------------#' @@ -166,8 +165,6 @@ SELECT expire_logs_days = @@session.expire_logs_days; ############################## SET @@global.expire_logs_days = @start_value; -SELECT @@global.expire_logs_days; - ######################################################################## # END OF expire_logs_days TESTS # diff --git a/mysql-test/suite/sys_vars/t/general_log_file_basic.test b/mysql-test/suite/sys_vars/t/general_log_file_basic.test index 0a169b472e2..afbfa1a6c03 100644 --- a/mysql-test/suite/sys_vars/t/general_log_file_basic.test +++ b/mysql-test/suite/sys_vars/t/general_log_file_basic.test @@ -36,7 +36,7 @@ ######################################################################## SET @start_value = @@global.general_log_file; -SELECT @start_value; +SELECT length(@start_value) > 0; --echo '#---------------------FN_DYNVARS_004_01-------------------------#' @@ -45,7 +45,7 @@ SELECT @start_value; ############################################### SET @@global.general_log_file = DEFAULT; -SELECT @@global.general_log_file; +SELECT length(@@global.general_log_file) > 0; --echo '#--------------------FN_DYNVARS_004_02------------------------#' diff --git a/mysql-test/suite/sys_vars/t/histogram_size_basic.test b/mysql-test/suite/sys_vars/t/histogram_size_basic.test index d65936e3616..1ddab38780e 100644 --- a/mysql-test/suite/sys_vars/t/histogram_size_basic.test +++ b/mysql-test/suite/sys_vars/t/histogram_size_basic.test @@ -10,9 +10,8 @@ ############################################################# SET @start_global_value = @@global.histogram_size; -SELECT @start_global_value; SET @start_session_value = @@session.histogram_size; -SELECT @start_session_value; +SELECT @start_global_value = @start_session_value; --echo '#--------------------FN_DYNVARS_053_01-------------------------#' ################################################################ @@ -131,10 +130,7 @@ SELECT @@local.histogram_size = @@session.histogram_size; #################################### SET @@global.histogram_size = @start_global_value; -SELECT @@global.histogram_size; SET @@session.histogram_size = @start_session_value; -SELECT @@session.histogram_size; - ################################################### # END OF histogram_size TESTS # diff --git a/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test index 5171c0e1621..88e239574d2 100644 --- a/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test @@ -6,20 +6,20 @@ --source include/have_innodb.inc SET @start_global_value = @@global.innodb_adaptive_hash_index; -SELECT @start_global_value; # # exists as global only # --echo Valid values are 'ON' and 'OFF' select @@global.innodb_adaptive_hash_index in (0, 1); -select @@global.innodb_adaptive_hash_index; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.innodb_adaptive_hash_index; +--replace_column 2 # show global variables like 'innodb_adaptive_hash_index'; +--replace_column 2 # show session variables like 'innodb_adaptive_hash_index'; -select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index'; -select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index'; +select variable_name from information_schema.global_variables where variable_name='innodb_adaptive_hash_index'; +select variable_name from information_schema.session_variables where variable_name='innodb_adaptive_hash_index'; # # show that it's writable @@ -67,4 +67,3 @@ set global innodb_adaptive_hash_index='AUTO'; # SET @@global.innodb_adaptive_hash_index = @start_global_value; -SELECT @@global.innodb_adaptive_hash_index; diff --git a/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test index 8e7612b0d9e..b8983093414 100644 --- a/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_log_optimize_ddl_basic.test @@ -21,9 +21,6 @@ SELECT COUNT(@@GLOBAL.innodb_log_optimize_ddl); SELECT COUNT(@@SESSION.innodb_log_optimize_ddl); --echo Expected error 'Variable is a GLOBAL variable' -#### Display the default value -SELECT @@GLOBAL.innodb_log_optimize_ddl; - SELECT @@GLOBAL.innodb_log_optimize_ddl INTO @innodb_log_optimize_ddl_save; #### Check if the value can be set SET @@GLOBAL.innodb_log_optimize_ddl = ON; diff --git a/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test index e8cc46086bc..0459d46ab0f 100644 --- a/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test @@ -26,6 +26,10 @@ --source include/have_innodb.inc --source include/load_sysvars.inc +# set default value for test +SET @save_innodb_max_dirty_pages_pct=@@global.innodb_max_dirty_pages_pct; +set @@global.innodb_max_dirty_pages_pct=75; + ###################################################################### # START OF innodb_max_dirty_pages_pct TESTS # ###################################################################### @@ -184,6 +188,8 @@ SELECT @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct_lwm = @global_start_max_dirty_lwm_value; SELECT @@global.innodb_max_dirty_pages_pct_lwm; +SET @@global.innodb_max_dirty_pages_pct=@save_innodb_max_dirty_pages_pct; + ############################################################### # END OF innodb_max_dirty_pages_pct TESTS # ############################################################### diff --git a/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_lwm_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_lwm_basic.test index b06f209a263..947c1bfac9e 100644 --- a/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_lwm_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_lwm_basic.test @@ -26,6 +26,10 @@ --source include/have_innodb.inc --source include/load_sysvars.inc +# set default value for test +SET @save_innodb_max_dirty_pages_pct=@@global.innodb_max_dirty_pages_pct; +set @@global.innodb_max_dirty_pages_pct=75; + ###################################################################### # START OF innodb_max_dirty_pages_pct_lwm TESTS # ###################################################################### @@ -164,6 +168,8 @@ SELECT @@global.innodb_max_dirty_pages_pct; SET @@global.innodb_max_dirty_pages_pct_lwm = @pct_lwm_start_value; SELECT @@global.innodb_max_dirty_pages_pct_lwm; +SET @@global.innodb_max_dirty_pages_pct=@save_innodb_max_dirty_pages_pct; + ############################################################### # END OF innodb_max_dirty_pages_pct_lwm TESTS # ############################################################### diff --git a/mysql-test/suite/sys_vars/t/innodb_read_io_threads_basic.opt b/mysql-test/suite/sys_vars/t/innodb_read_io_threads_basic.opt new file mode 100644 index 00000000000..3ead0984f93 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/innodb_read_io_threads_basic.opt @@ -0,0 +1 @@ +--innodb_read_io_threads=2 diff --git a/mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.opt b/mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.opt new file mode 100644 index 00000000000..9740d1adafd --- /dev/null +++ b/mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.opt @@ -0,0 +1 @@ +--innodb_write_io_threads=2 diff --git a/mysql-test/suite/sys_vars/t/join_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic.test index 6ebaa14ab92..d610ddb106e 100644 --- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic.test +++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic.test @@ -35,10 +35,7 @@ ############################################################# SET @start_global_value = @@global.join_buffer_size; -SELECT @start_global_value; SET @start_session_value = @@session.join_buffer_size; -SELECT @start_session_value; - --echo '#--------------------FN_DYNVARS_053_01-------------------------#' ################################################################ @@ -46,10 +43,10 @@ SELECT @start_session_value; ################################################################ SET @@global.join_buffer_size = DEFAULT; -SELECT @@global.join_buffer_size; +SELECT @@global.join_buffer_size > 0; SET @@session.join_buffer_size = DEFAULT; -SELECT @@session.join_buffer_size; +SELECT @@session.join_buffer_size > 0; --echo '#--------------------FN_DYNVARS_053_03-------------------------#' @@ -182,10 +179,7 @@ SELECT join_buffer_size = @@session.join_buffer_size; #################################### SET @@global.join_buffer_size = @start_global_value; -SELECT @@global.join_buffer_size; SET @@session.join_buffer_size = @start_session_value; -SELECT @@session.join_buffer_size; - ######################################################## # END OF join_buffer_size TESTS # diff --git a/mysql-test/suite/sys_vars/t/join_buffer_space_limit_basic.test b/mysql-test/suite/sys_vars/t/join_buffer_space_limit_basic.test index 46d09062abc..0182820ff79 100644 --- a/mysql-test/suite/sys_vars/t/join_buffer_space_limit_basic.test +++ b/mysql-test/suite/sys_vars/t/join_buffer_space_limit_basic.test @@ -5,11 +5,13 @@ SET @start_global_value = @@global.join_buffer_space_limit; # # exists as global and session # -select @@global.join_buffer_space_limit; -select @@session.join_buffer_space_limit; +--replace_column 2 # show global variables like 'join_buffer_space_limit'; +--replace_column 2 # show session variables like 'join_buffer_space_limit'; +--replace_column 2 # select * from information_schema.global_variables where variable_name='join_buffer_space_limit'; +--replace_column 2 # select * from information_schema.session_variables where variable_name='join_buffer_space_limit'; # @@ -41,4 +43,3 @@ set session join_buffer_space_limit=cast(-1 as unsigned int); select @@session.join_buffer_space_limit; SET @@global.join_buffer_space_limit = @start_global_value; - diff --git a/mysql-test/suite/sys_vars/t/join_cache_level_basic.test b/mysql-test/suite/sys_vars/t/join_cache_level_basic.test index 1e0deb9c028..a39ddffeab2 100644 --- a/mysql-test/suite/sys_vars/t/join_cache_level_basic.test +++ b/mysql-test/suite/sys_vars/t/join_cache_level_basic.test @@ -5,11 +5,13 @@ SET @start_global_value = @@global.join_cache_level; # # exists as global only # -select @@global.join_cache_level; -select @@session.join_cache_level; +--replace_column 2 # show global variables like 'join_cache_level'; +--replace_column 2 # show session variables like 'join_cache_level'; +--replace_column 2 # select * from information_schema.global_variables where variable_name='join_cache_level'; +--replace_column 2 # select * from information_schema.session_variables where variable_name='join_cache_level'; # @@ -39,4 +41,3 @@ set session join_cache_level=cast(-1 as unsigned int); select @@session.join_cache_level; SET @@global.join_cache_level = @start_global_value; - diff --git a/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test index f45fa5da9c5..9f1cf6351a0 100644 --- a/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test +++ b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test @@ -1,12 +1,12 @@ # set session SET @start_global_value = @@global.log_slow_verbosity; +select @@global.log_slow_verbosity = @@session.log_slow_verbosity; +SET @@global.log_slow_verbosity="",@@session.log_slow_verbosity=""; # # exists as global only # -select @@global.log_slow_verbosity; -select @@session.log_slow_verbosity; show global variables like 'log_slow_verbosity'; show session variables like 'log_slow_verbosity'; select * from information_schema.global_variables where variable_name='log_slow_verbosity'; diff --git a/mysql-test/suite/sys_vars/t/long_query_time_basic.test b/mysql-test/suite/sys_vars/t/long_query_time_basic.test index 492ccfbc617..f3acdb61931 100644 --- a/mysql-test/suite/sys_vars/t/long_query_time_basic.test +++ b/mysql-test/suite/sys_vars/t/long_query_time_basic.test @@ -35,10 +35,7 @@ ############################################################# SET @start_global_value = @@global.long_query_time; -SELECT @start_global_value; SET @start_session_value = @@session.long_query_time; -SELECT @start_session_value; - --echo '#--------------------FN_DYNVARS_068_01-------------------------#' ############################################################### @@ -47,24 +44,11 @@ SELECT @start_session_value; SET @@global.long_query_time = 100; SET @@global.long_query_time = DEFAULT; -SELECT @@global.long_query_time; +SELECT @@global.long_query_time >= 0; SET @@session.long_query_time = 200; SET @@session.long_query_time = DEFAULT; -SELECT @@session.long_query_time; - - ---echo '#--------------------FN_DYNVARS_068_02-------------------------#' -############################################################### -# Check the DEFAULT value of long_query_time # -############################################################### - -SET @@global.long_query_time = DEFAULT; -SELECT @@global.long_query_time = 10; - -SET @@session.long_query_time = DEFAULT; -SELECT @@session.long_query_time = 10; - +SELECT @@session.long_query_time >= 0; --echo '#--------------------FN_DYNVARS_068_03-------------------------#' ######################################################################### @@ -197,12 +181,7 @@ SELECT long_query_time = @@session.long_query_time; #################################### SET @@global.long_query_time = @start_global_value; -SELECT @@global.long_query_time; -SET @@session.long_query_time = @start_session_value; -SELECT @@session.long_query_time; - #################################################### # END OF long_query_time TESTS # #################################################### - diff --git a/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test index ee25b6d8f5f..fda349fce41 100644 --- a/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test +++ b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test @@ -35,7 +35,6 @@ ############################################################# SET @start_global_value = @@global.max_allowed_packet; -SELECT @start_global_value; # give a known value to @@session.max_allowed_packet by assigning to # @@global and setting up a new connection (for deterministic result @@ -219,9 +218,6 @@ SELECT max_allowed_packet = @@session.max_allowed_packet; connection default; SET @@global.max_allowed_packet = @start_global_value; -SELECT @@global.max_allowed_packet; -SELECT @@session.max_allowed_packet; - ####################################################### # END OF max_allowed_packet TESTS # diff --git a/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test index 2ba3d552f6b..d60c10a1a33 100644 --- a/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test +++ b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test @@ -50,11 +50,11 @@ name BLOB --echo ## Setting value of max_allowed packet and net_buffer_length to 1024 ## --error ER_VARIABLE_IS_READONLY SET @@session.max_allowed_packet = 1024; -SELECT @@session.max_allowed_packet; +SELECT @@session.max_allowed_packet > 0; --error ER_VARIABLE_IS_READONLY SET @@session.net_buffer_length = 1024; -SELECT @@session.net_buffer_length; +SELECT @@session.net_buffer_length > 0; --echo '#--------------------FN_DYNVARS_070_02-------------------------#' diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test index cc860e92fbb..654ccfd45b8 100644 --- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test +++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test @@ -35,7 +35,7 @@ ###################################################################### SET @start_value = @@global.max_connect_errors; -SELECT @start_value; +SELECT @start_value >= 0; --echo '#--------------------FN_DYNVARS_073_01------------------------#' @@ -45,7 +45,6 @@ SELECT @start_value; SET @@global.max_connect_errors = 5000; SET @@global.max_connect_errors = DEFAULT; -SELECT @@global.max_connect_errors; --echo '#---------------------FN_DYNVARS_073_02-------------------------#' ############################################### @@ -53,7 +52,7 @@ SELECT @@global.max_connect_errors; ############################################### SET @@global.max_connect_errors = @start_value; -SELECT @@global.max_connect_errors = 10; +SELECT @@global.max_connect_errors = @start_value; --echo '#--------------------FN_DYNVARS_073_03------------------------#' ################################################################## @@ -165,10 +164,7 @@ SELECT max_connect_errors = @@session.max_connect_errors; ############################## SET @@global.max_connect_errors = @start_value; -SELECT @@global.max_connect_errors; - ################################################################## -# END OF max_connect_errors TESTS # +# END OF max_connect_errors TESTS # ################################################################## - diff --git a/mysql-test/suite/sys_vars/t/max_connections_basic.test b/mysql-test/suite/sys_vars/t/max_connections_basic.test index de259b32c17..b4f3afbf3b6 100644 --- a/mysql-test/suite/sys_vars/t/max_connections_basic.test +++ b/mysql-test/suite/sys_vars/t/max_connections_basic.test @@ -35,7 +35,7 @@ ################################################################### SET @start_value = @@global.max_connections; -SELECT @start_value; +SELECT @start_value > 0; --echo '#--------------------FN_DYNVARS_074_01------------------------#' @@ -43,9 +43,9 @@ SELECT @start_value; # Display the DEFAULT value of max_connections # ################################################################## -SET @@global.max_connections = 5000; +SET @@global.max_connections = @start_value+1; SET @@global.max_connections = DEFAULT; -SELECT @@global.max_connections; +SELECT @@global.max_connections <> @start_value+1; --echo '#---------------------FN_DYNVARS_074_02-------------------------#' ############################################### @@ -53,7 +53,7 @@ SELECT @@global.max_connections; ############################################### SET @@global.max_connections = @start_value; -SELECT @@global.max_connections = 151; +SELECT @@global.max_connections = @start_value; --echo '#--------------------FN_DYNVARS_074_03------------------------#' @@ -166,10 +166,8 @@ SELECT max_connections = @@session.max_connections; ############################## SET @@global.max_connections = @start_value; -SELECT @@global.max_connections; ################################################################## # END OF max_connections TESTS # ################################################################## - diff --git a/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test index 5e4bcd9490d..26216814059 100644 --- a/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test @@ -35,9 +35,8 @@ ############################################################# SET @start_global_value = @@global.max_heap_table_size; -SELECT @start_global_value; SET @start_session_value = @@session.max_heap_table_size; -SELECT @start_session_value; +SELECT @start_session_value = @start_global_value; --echo '#--------------------FN_DYNVARS_077_01-------------------------#' @@ -47,23 +46,11 @@ SELECT @start_session_value; SET @@global.max_heap_table_size = 1677721610; SET @@global.max_heap_table_size = DEFAULT; -SELECT @@global.max_heap_table_size; +SELECT @@global.max_heap_table_size > 0; SET @@session.max_heap_table_size = 1677721610; SET @@session.max_heap_table_size = DEFAULT; -SELECT @@session.max_heap_table_size; - - ---echo '#--------------------FN_DYNVARS_077_02-------------------------#' -################################################################## -# Check the DEFAULT value of max_heap_table_size # -################################################################## - -SET @@global.max_heap_table_size = DEFAULT; -SELECT @@global.max_heap_table_size = 16777216; - -SET @@session.max_heap_table_size = DEFAULT; -SELECT @@session.max_heap_table_size = 16777216; +SELECT @@session.max_heap_table_size > 0; --echo '#--------------------FN_DYNVARS_077_03-------------------------#' @@ -216,12 +203,8 @@ SELECT max_heap_table_size = @@session.max_heap_table_size; #################################### SET @@global.max_heap_table_size = @start_global_value; -SELECT @@global.max_heap_table_size; -SET @@session.max_heap_table_size = @start_session_value; -SELECT @@session.max_heap_table_size; ####################################################### -# END OF max_heap_table_size TESTS # +# END OF max_heap_table_size TESTS # ####################################################### - diff --git a/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test index f648b23c0a3..0b85017983c 100644 --- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test +++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test @@ -1,5 +1,9 @@ # Test for max_seeks_for_key # +--source include/default_optimizer_switch.inc +set @@global.optimizer_switch=@@local.optimizer_switch; +set @@global.join_cache_level=@@local.join_cache_level; + --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings @@ -24,10 +28,6 @@ SET @start_value= @@global.max_seeks_for_key; CONNECT (test_con1,localhost,root,,); CONNECTION test_con1; -# Value of session & global vairable here should be 10 -SELECT @@global.max_seeks_for_key = 10; -SELECT @@session.max_seeks_for_key = 10; - # Setting global value of variable and inserting data in table SET @@global.max_seeks_for_key = 20; SELECT @@global.max_seeks_for_key; @@ -97,3 +97,5 @@ disconnect test_con2; DROP TABLE t1; SET @@global.max_seeks_for_key= @start_value; +SET @@global.optimizer_switch= @save_optimizer_switch; +SET @@global.join_cache_level= @save_join_cache_level; diff --git a/mysql-test/suite/sys_vars/t/myisam_recover_options_basic.opt b/mysql-test/suite/sys_vars/t/myisam_recover_options_basic.opt new file mode 100644 index 00000000000..a818d14b9ec --- /dev/null +++ b/mysql-test/suite/sys_vars/t/myisam_recover_options_basic.opt @@ -0,0 +1 @@ +--myisam-recover-options=BACKUP,QUICK diff --git a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test index 1aa25fa2c8e..81ff81ae935 100644 --- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test +++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test @@ -35,10 +35,9 @@ ############################################################# SET @start_global_value = @@global.myisam_sort_buffer_size ; -SELECT @start_global_value; -SET @start_session_value = @@session.myisam_sort_buffer_size ; -SELECT @start_session_value; - +SELECT @@session.myisam_sort_buffer_size = @@global.myisam_sort_buffer_size; +SET @@global.myisam_sort_buffer_size= default; +SET @default_myisam_sort_buffer_size= @@global.myisam_sort_buffer_size; --echo '#--------------------FN_DYNVARS_005_01-------------------------#' ######################################################################## @@ -47,23 +46,11 @@ SELECT @start_session_value; SET @@global.myisam_sort_buffer_size = 100; SET @@global.myisam_sort_buffer_size = DEFAULT; -SELECT @@global.myisam_sort_buffer_size ; +SELECT @@global.myisam_sort_buffer_size = @default_myisam_sort_buffer_size; SET @@session.myisam_sort_buffer_size = 200; SET @@session.myisam_sort_buffer_size = DEFAULT; -SELECT @@session.myisam_sort_buffer_size ; - - ---echo '#--------------------FN_DYNVARS_005_02-------------------------#' -######################################################################## -# Check the DEFAULT value of myisam_sort_buffer_size # -######################################################################## - -SET @@global.myisam_sort_buffer_size = DEFAULT; -SELECT @@global.myisam_sort_buffer_size = 134216704; - -SET @@session.myisam_sort_buffer_size = DEFAULT; -SELECT @@session.myisam_sort_buffer_size = 134216704; +SELECT @@session.myisam_sort_buffer_size = @default_myisam_sort_buffer_size; --echo '#--------------------FN_DYNVARS_005_03-------------------------#' @@ -95,9 +82,6 @@ SELECT @@session.myisam_sort_buffer_size ; SET @@session.myisam_sort_buffer_size = 655345; SELECT @@session.myisam_sort_buffer_size ; - - - --echo '#------------------FN_DYNVARS_005_05-----------------------#' #################################################################### # Change the value of myisam_sort_buffer_size to an invalid value # @@ -236,12 +220,7 @@ SELECT myisam_sort_buffer_size = @@session.myisam_sort_buffer_size ; #################################### SET @@global.myisam_sort_buffer_size = @start_global_value; -SELECT @@global.myisam_sort_buffer_size ; -SET @@session.myisam_sort_buffer_size = @start_session_value; -SELECT @@session.myisam_sort_buffer_size ; - ############################################################# # END OF myisam_sort_buffer_size TESTS # ############################################################# - diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test index 210910d7a86..ef9d8f17832 100644 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test +++ b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test @@ -1,10 +1,10 @@ +--source include/default_optimizer_switch.inc # # 2010-01-20 OBN Added check for I_S values after variable value changed # -SET @start_global_value = @@global.optimizer_switch; -SELECT @start_global_value; +set @@global.optimizer_switch=@@optimizer_switch; # # exists as global and session @@ -49,5 +49,4 @@ set session optimizer_switch="index_merge"; --error ER_WRONG_VALUE_FOR_VAR set session optimizer_switch="foobar"; -SET @@global.optimizer_switch = @start_global_value; -SELECT @@global.optimizer_switch; +SET @@global.optimizer_switch = @save_optimizer_switch; diff --git a/mysql-test/suite/sys_vars/t/optimizer_use_condition_selectivity_basic.test b/mysql-test/suite/sys_vars/t/optimizer_use_condition_selectivity_basic.test index c409abd0d1b..1529db1a145 100644 --- a/mysql-test/suite/sys_vars/t/optimizer_use_condition_selectivity_basic.test +++ b/mysql-test/suite/sys_vars/t/optimizer_use_condition_selectivity_basic.test @@ -11,41 +11,13 @@ ############################################################# SET @start_global_value = @@global.optimizer_use_condition_selectivity; -SELECT @start_global_value; SET @start_session_value = @@session.optimizer_use_condition_selectivity; -SELECT @start_session_value; - - ---echo '#--------------------FN_DYNVARS_115_01-------------------------#' -######################################################################### -# Display the DEFAULT value of optimizer_use_condition_selectivity # -######################################################################### - -SET @@global.optimizer_use_condition_selectivity = DEFAULT; -SELECT @@global.optimizer_use_condition_selectivity; - -SET @@session.optimizer_use_condition_selectivity = DEFAULT; -SELECT @@session.optimizer_use_condition_selectivity; - - ---echo '#--------------------FN_DYNVARS_115_02-------------------------#' -######################################################################### -# Check the DEFAULT value of optimizer_use_condition_selectivity # -######################################################################### - -SET @@global.optimizer_use_condition_selectivity = DEFAULT; -SELECT @@global.optimizer_use_condition_selectivity = 1; - -SET @@session.optimizer_use_condition_selectivity = DEFAULT; -SELECT @@session.optimizer_use_condition_selectivity = 1; - --echo '#--------------------FN_DYNVARS_115_03-------------------------#' ############################################################################################# # Change the value of optimizer_use_condition_selectivity to a valid value for GLOBAL Scope # ############################################################################################# -SELECT @@global.optimizer_use_condition_selectivity; SET @@global.optimizer_use_condition_selectivity = 0; SELECT @@global.optimizer_use_condition_selectivity; SET @@global.optimizer_use_condition_selectivity = 1; @@ -67,7 +39,6 @@ SELECT @@global.optimizer_use_condition_selectivity; # Change the value of optimizer_use_condition_selectivity to a valid value for SESSION Scope# ############################################################################################# -SELECT @@session.optimizer_use_condition_selectivity; SET @@session.optimizer_use_condition_selectivity = 0; SELECT @@session.optimizer_use_condition_selectivity; SET @@session.optimizer_use_condition_selectivity = 1; @@ -144,9 +115,6 @@ SELECT @@local.optimizer_use_condition_selectivity = @@session.optimizer_use_con #################################### SET @@global.optimizer_use_condition_selectivity = @start_global_value; -SELECT @@global.optimizer_use_condition_selectivity; -SET @@session.optimizer_use_condition_selectivity = @start_session_value; -SELECT @@session.optimizer_use_condition_selectivity; ######################################################################## # END OF optimizer_use_condition_selectivity TESTS # diff --git a/mysql-test/suite/sys_vars/t/relay_log_basic.test b/mysql-test/suite/sys_vars/t/relay_log_basic.test index 1ea60577556..c279c38fde0 100644 --- a/mysql-test/suite/sys_vars/t/relay_log_basic.test +++ b/mysql-test/suite/sys_vars/t/relay_log_basic.test @@ -1,13 +1,21 @@ --source include/not_embedded.inc + +let $MYSQLD_RELAY_LOG=`select @@global.relay_log`; + # # only global # +--replace_result $MYSQLD_RELAY_LOG RELAY_LOG select @@global.relay_log; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.relay_log; +--replace_result $MYSQLD_RELAY_LOG RELAY_LOG show global variables like 'relay_log'; +--replace_result $MYSQLD_RELAY_LOG RELAY_LOG show session variables like 'relay_log'; +--replace_result $MYSQLD_RELAY_LOG RELAY_LOG select * from information_schema.global_variables where variable_name='relay_log'; +--replace_result $MYSQLD_RELAY_LOG RELAY_LOG select * from information_schema.session_variables where variable_name='relay_log'; # diff --git a/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test index 69ca5f21f62..87a3e671b95 100644 --- a/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test +++ b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test @@ -43,7 +43,7 @@ SET @start_value = @@global.slow_query_log_file; ############################################### SET @@global.slow_query_log_file = DEFAULT; -SELECT @@global.slow_query_log_file; +SELECT length(@@global.slow_query_log_file) > 0; --echo '#--------------------FN_DYNVARS_004_02------------------------#' diff --git a/mysql-test/suite/sys_vars/t/sync_binlog_basic.test b/mysql-test/suite/sys_vars/t/sync_binlog_basic.test index 5b7c5f37191..4b5cc379fbf 100644 --- a/mysql-test/suite/sys_vars/t/sync_binlog_basic.test +++ b/mysql-test/suite/sys_vars/t/sync_binlog_basic.test @@ -36,27 +36,6 @@ ################################################################## SET @start_value = @@global.sync_binlog; -SELECT @start_value; - - ---echo '#--------------------FN_DYNVARS_168_01------------------------#' -################################################################## -# Display the DEFAULT value of sync_binlog # -################################################################## - -SET @@global.sync_binlog = 99; -SET @@global.sync_binlog = DEFAULT; -SELECT @@global.sync_binlog; - - ---echo '#---------------------FN_DYNVARS_168_02-------------------------#' -############################################### -# Verify default value of variable # -############################################### - -SET @@global.sync_binlog = @start_value; -SELECT @@global.sync_binlog = 0; - --echo '#--------------------FN_DYNVARS_168_03------------------------#' ################################################################### @@ -121,8 +100,6 @@ SELECT @@global.sync_binlog = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sync_binlog'; - - --echo '#---------------------FN_DYNVARS_168_07----------------------#' ########################################################################## # Check if sync_binlog can be accessed with and without @@ sign # @@ -144,9 +121,7 @@ SELECT sync_binlog = @@session.sync_binlog; ############################## SET @@global.sync_binlog = @start_value; -SELECT @@global.sync_binlog; - ######################################################################## -# END OF sync_binlog TESTS # +# END OF sync_binlog TESTS # ######################################################################## diff --git a/mysql-test/suite/sys_vars/t/sysvars_aria.test b/mysql-test/suite/sys_vars/t/sysvars_aria.test index 67fb0baa4f1..b01e39eebf5 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_aria.test +++ b/mysql-test/suite/sys_vars/t/sysvars_aria.test @@ -3,6 +3,6 @@ --source include/word_size.inc --vertical_results -select * from information_schema.system_variables +select VARIABLE_NAME, SESSION_VALUE, DEFAULT_VALUE, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT, NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT from information_schema.system_variables where variable_name like 'aria%' order by variable_name; diff --git a/mysql-test/suite/sys_vars/t/sysvars_debug.test b/mysql-test/suite/sys_vars/t/sysvars_debug.test index 71d396e2df3..fbdcbd683df 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_debug.test +++ b/mysql-test/suite/sys_vars/t/sysvars_debug.test @@ -4,5 +4,4 @@ --vertical_results select * from information_schema.system_variables where variable_name like 'debug%' - or variable_name = 'in_predicate_conversion_threshold' order by variable_name; diff --git a/mysql-test/suite/sys_vars/t/sysvars_innodb.test b/mysql-test/suite/sys_vars/t/sysvars_innodb.test index c573c5592b2..ef52ee3264a 100644 --- a/mysql-test/suite/sys_vars/t/sysvars_innodb.test +++ b/mysql-test/suite/sys_vars/t/sysvars_innodb.test @@ -5,7 +5,7 @@ --vertical_results --replace_regex /^\/\S+/PATH/ /\.\//PATH/ -select * from information_schema.system_variables +select VARIABLE_NAME, SESSION_VALUE, DEFAULT_VALUE, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT, NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT from information_schema.system_variables where variable_name like 'innodb%' and variable_name not in ( 'innodb_version', # always the same as the server version diff --git a/mysql-test/suite/sys_vars/t/sysvars_server_embedded.opt b/mysql-test/suite/sys_vars/t/sysvars_server_embedded.opt deleted file mode 100644 index c3f0d3bd51f..00000000000 --- a/mysql-test/suite/sys_vars/t/sysvars_server_embedded.opt +++ /dev/null @@ -1 +0,0 @@ ---table_open_cache=100 diff --git a/mysql-test/suite/sys_vars/t/sysvars_server_notembedded.opt b/mysql-test/suite/sys_vars/t/sysvars_server_notembedded.opt deleted file mode 100644 index c3f0d3bd51f..00000000000 --- a/mysql-test/suite/sys_vars/t/sysvars_server_notembedded.opt +++ /dev/null @@ -1 +0,0 @@ ---table_open_cache=100 diff --git a/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test index d7a6ff25a0b..c887608b00f 100644 --- a/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test +++ b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test @@ -1,27 +1,27 @@ -############## mysql-test\t\table_definition_cache_basic.test ################## -# # -# Variable Name: table_definition_cache # -# Scope: GLOBAL # -# Access Type: Dynamic # -# Data Type: Numeric # -# Default Value: 400 # -# Range: 1 - 524288 # -# # -# # -# Creation Date: 2008-03-16 # -# Author: Salman Rawala # -# # -# Description: Test Cases of Dynamic System Variable "table_definition_cache" # -# that checks behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity . # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html#option_mysqld_table_definition_cache # -# # -################################################################################ +############## mysql-test\t\table_definition_cache_basic.test ################# +# # +# Variable Name: table_definition_cache # +# Scope: GLOBAL # +# Access Type: Dynamic # +# Data Type: Numeric # +# Default Value: 400 # +# Range: 1 - 524288 # +# # +# # +# Creation Date: 2008-03-16 # +# Author: Salman Rawala # +# # +# Description: Test Cases of Dynamic System Variable "table_definition_cache" # +# that checks behavior of this variable in the following ways # +# * Default Value # +# * Valid & Invalid values # +# * Scope & Access method # +# * Data Integrity . # +# # +# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # +# server-system-variables.html#option_mysqld_table_definition_cache # +# # +############################################################################### --source include/load_sysvars.inc @@ -34,7 +34,6 @@ ############################################################################## SET @start_value = @@global.table_definition_cache; -SELECT @start_value; --echo '#--------------------FN_DYNVARS_019_01------------------------#' ####################################################################### @@ -43,16 +42,7 @@ SELECT @start_value; SET @@global.table_definition_cache = 100; SET @@global.table_definition_cache = DEFAULT; -SELECT @@global.table_definition_cache; - - ---echo '#---------------------FN_DYNVARS_019_02-------------------------#' -############################################### -# Verify default value of variable # -############################################### - -SET @@global.table_definition_cache = DEFAULT; -SELECT @@global.table_definition_cache = 400; +SELECT @@global.table_definition_cache > 0; --echo '#--------------------FN_DYNVARS_019_03------------------------#' @@ -147,10 +137,7 @@ SELECT table_definition_cache = @@session.table_definition_cache; ############################## SET @@global.table_definition_cache = @start_value; -SELECT @@global.table_definition_cache; - ################################################################ # END OF table_definition_cache TESTS # ################################################################ - diff --git a/mysql-test/suite/sys_vars/t/userstat_basic.test b/mysql-test/suite/sys_vars/t/userstat_basic.test index 55aa98c90c7..cd227b7c507 100644 --- a/mysql-test/suite/sys_vars/t/userstat_basic.test +++ b/mysql-test/suite/sys_vars/t/userstat_basic.test @@ -1,13 +1,14 @@ # bool global SET @start_global_value = @@global.userstat; - # # exists as global only # -select @@global.userstat; +select @@global.userstat = 0 or @@global.userstat = 1; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.userstat; + +SET @@global.userstat=0; show global variables like 'userstat'; show session variables like 'userstat'; select * from information_schema.global_variables where variable_name='userstat'; |