diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/t/character_set_client_basic.test')
| -rw-r--r-- | mysql-test/suite/sys_vars/t/character_set_client_basic.test | 11 |
1 files changed, 5 insertions, 6 deletions
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 # |