WL#4681: Took the system variable tests out of the main test suite, put them into "sys_vars", updated some reult files and tests.

1 files changed, 0 insertions, 271 deletions

diff --git a/mysql-test/t/character_set_results_basic.test b/mysql-test/t/character_set_results_basic.test
deleted file mode 100644
index aae05c824d1..00000000000
--- a/mysql-test/t/character_set_results_basic.test
+++ /dev/null
@@ -1,271 +0,0 @@
-############## mysql-test\t\character_set_results_basic.test ##################
-#                                                                             #
-# Variable Name: character_set_results                                        #
-# Scope: GLOBAL | SESSION                                                     #
-# Access Type: Dynamic                                                        #
-# Data Type: string                                                           #
-# Default Value: utf8 (session), latin1 (global)                              #
-# Range: NA                                                                   #
-#                                                                             #
-#                                                                             #
-# Creation Date: 2008-02-07                                                   #
-# Author:  Rizwan                                                             #
-#                                                                             #
-# Description: Test Cases of Dynamic System Variable character_set_results    #
-#              that checks the 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                                               #
-#                                                                             #
-###############################################################################
---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/load_sysvars.inc
-################################################
-##       START OF character_set_results TESTS ##
-################################################
-
-#############################################################
-#                 Save initial value                        #
-#############################################################
-SET @global_start_value = @@global.character_set_results;
-SELECT @global_start_value;
-# Save initial session value
-SET @session_start_value = @@character_set_results;
-SELECT @session_start_value;
-# now save using local access 
-SET @session_start_value = @@local.character_set_results;
-SELECT @session_start_value;
-# save using default access (session)
-SET @session_start_value = @@session.character_set_results;
-SELECT @session_start_value;
-
---echo '#--------------------FN_DYNVARS_013_01------------------#'
-##############################################################################
-#       Test Variable access and assignment with and withoud @@              #
-##############################################################################
-# select without @@
---error ER_BAD_FIELD_ERROR
-SELECT character_set_results;
-# assign value without @@
-SET character_set_results=utf8;
-SELECT @@session.character_set_results;
-# assign global variable without @@
---Error ER_PARSE_ERROR
-SET global.character_set_results=utf8;
-# using another syntax for accessing session variable
-SET session character_set_results=utf8;
-# accessing variable with scope the wrong way
---Error ER_BAD_FIELD_ERROR
-SELECT session character_set_results;
-# using another syntax for accessing dynamic variable
-SET global character_set_results=utf8;
---Error ER_BAD_FIELD_ERROR
-SELECT global character_set_results;
-
---echo '#--------------------FN_DYNVARS_013_02-------------------------#'
-###############################################################################
-#     Check the DEFAULT value of character_set_results for session and global #
-###############################################################################
-SET @@character_set_results = latin5;
-SET @@character_set_results = DEFAULT;
-SELECT @@character_set_results AS DEFAULT_VALUE;
-
-SET @@global.character_set_results = latin5;
-SET @@global.character_set_results = DEFAULT;
-SELECT @@global.character_set_results;
-
---echo '#--------------------FN_DYNVARS_013_03-------------------------#'
-###############################################################################
-#     see if setting global value changes session value and vice versa        #
-###############################################################################
-SET @@session.character_set_results = utf8;
-SELECT @@session.character_set_results;
-SET @@global.character_set_results = latin2;
-SELECT @@global.character_set_results;
-SELECT @@session.character_set_results AS res_is_utf8;
-
-SET @@session.character_set_results = latin5;
-SELECT @@session.character_set_results;
-SELECT @@global.character_set_results AS res_is_latin2;
-# composite check
-SELECT @@global.character_set_results=@@session.character_set_results 
-AS res_is_false;
-
---echo '#--------------------FN_DYNVARS_013_04-------------------------#'
-###################################################################
-#  Check if accessing variable with and without session point to  #
-#  session variable                                               #
-###################################################################
-SELECT @@character_set_results = @@session.character_set_results AS res;
-SELECT @@character_set_results = @@local.character_set_results AS res;
-
---echo '#--------------------FN_DYNVARS_013_05-------------------------#'
-###########################################################################
-#     Check if combining character set works                              #
-###########################################################################
---Error ER_BAD_FIELD_ERROR
-SET @@character_set_results = utf8 + latin2;
-
---echo '#--------------------FN_DYNVARS_013_06-------------------------#'
-##############################################################################
-#     Change the value of character_set_results to a valid value for session #
-##############################################################################
-
-let charset_variable = @@session.character_set_results;
---source include/charset_basic.inc
-
-
---echo '#--------------------FN_DYNVARS_013_07-------------------------#'
-###############################################################################
-#  Change the value of character_set_results to a valid value for global      #
-###############################################################################
-
-let charset_variable = @@global.character_set_results;
---source include/charset_basic.inc
-
-
---echo '#--------------------FN_DYNVARS_013_08-------------------------#'
-################################################################################
-#  Change the value of character_set_results to a valid value with uppercase,  #
-#  lowercase and mixedcase                                                     #
-################################################################################
-SET @@character_set_results = UTF8;
-SELECT @@character_set_results;
-SET @@character_set_results = utf8;
-SELECT @@character_set_results;
-
-SET @@global.character_set_results = uTf8;
-SELECT @@global.character_set_results;
-
---echo '#--------------------FN_DYNVARS_013_09-------------------------#'
-##############################################################
-#     Check if 1,2,3, ... values can be used on variable     #
-##############################################################
-SET @@character_set_results = 1;
-SELECT @@character_set_results;
-SET @@character_set_results = 2;
-SELECT @@character_set_results;
-SET @@character_set_results = 3;
-SELECT @@character_set_results;
-SET @@character_set_results = 36;
-SELECT @@character_set_results;
-SET @@character_set_results = 99;
-SELECT @@character_set_results;
-
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = 100;
-
-SET @@global.character_set_results = 1;
-SELECT @@global.character_set_results;
-SET @@global.character_set_results = 2;
-SELECT @@global.character_set_results;
-SET @@global.character_set_results = 3;
-SELECT @@global.character_set_results;
-SET @@global.character_set_results = 36;
-SELECT @@global.character_set_results;
-SET @@global.character_set_results = 99;
-SELECT @@global.character_set_results;
-
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = 100;
-
-SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
-SELECT @total_charset;
---echo 'Bug # 34843: character sets are mapped in such a way that 100 and following';
---echo 'numbers gives error, and before 100 the 36 mapped wraps arround several times.';
-
---echo '#--------------------FN_DYNVARS_013_10-------------------------#'
-###############################################################################
-#  Change the value of character_set_results to an invalid value for session  #
-###############################################################################
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = abc;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = 1utf8;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = 0;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@character_set_results = .1;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = -1;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = "";
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = 'utf';
-SET @@character_set_results = true;
-SELECT @@character_set_results AS res_with_true;
-
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@character_set_results = ON;
-
---echo '#--------------------FN_DYNVARS_013_11-------------------------#'
-###############################################################################
-#  Change the value of character_set_results to an invalid value for global   #
-###############################################################################
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = "'latin2'";
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = 1utf8;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = 0;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.character_set_results = 0.1;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = -1;
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = "";
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = 'utf';
-
-SET @@global.character_set_results = true;
-
---Error ER_UNKNOWN_CHARACTER_SET
-SET @@global.character_set_results = ON;
-
---echo '#--------------------FN_DYNVARS_013_12-------------------------#'
-##############################################################################
-#     Check if the value in GLOBAL Table matches value in variable           #
-##############################################################################
-SELECT @@global.character_set_results =
- (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-  WHERE VARIABLE_NAME='character_set_results') AS res;
-SET @@global.character_set_results = 1;
-SELECT @@global.character_set_results;
-SELECT @@global.character_set_results =
- (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-  WHERE VARIABLE_NAME='character_set_results') AS res;
-
---echo '#--------------------FN_DYNVARS_013_13-------------------------#'
-##############################################################################
-#     Check if the value in SESSION Table matches value in variable          #
-##############################################################################
-SELECT @@character_set_results =
- (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-  WHERE VARIABLE_NAME='character_set_results') AS res;
-SELECT @@local.character_set_results =
- (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-  WHERE VARIABLE_NAME='character_set_results') AS res;
-SELECT @@session.character_set_results =
- (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-  WHERE VARIABLE_NAME='character_set_results') AS res;
-
-####################################
-#     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        #
-#############################################################