diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/r/character_set_client_basic.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/character_set_client_basic.result | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result index 749e669dd26..1464c35cc20 100644 --- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result @@ -1,7 +1,5 @@ SET @global_start_value = @@global.character_set_client; -SELECT @global_start_value; -@global_start_value -latin1 +SET @@global.character_set_client=@@character_set_client; SET @session_start_value = @@character_set_client; SELECT @session_start_value; @session_start_value @@ -30,14 +28,14 @@ ERROR 42S22: Unknown column 'global' in 'field list' '#--------------------FN_DYNVARS_010_02-------------------------#' SET @@character_set_client = latin5; SET @@character_set_client = DEFAULT; -SELECT @@character_set_client AS DEFAULT_VALUE; -DEFAULT_VALUE -utf8 +SELECT @@character_set_client = @@global.character_set_client; +@@character_set_client = @@global.character_set_client +1 SET @@global.character_set_client = latin5; SET @@global.character_set_client = DEFAULT; -SELECT @@global.character_set_client; -@@global.character_set_client -latin1 +SELECT @@global.character_set_client= @global_start_value; +@@global.character_set_client= @global_start_value +1 '#--------------------FN_DYNVARS_010_03-------------------------#' SET @@session.character_set_client = utf8; SELECT @@session.character_set_client; @@ -500,10 +498,4 @@ WHERE VARIABLE_NAME='character_set_client') AS res; res 1 SET @@global.character_set_client = @global_start_value; -SELECT @@global.character_set_client; -@@global.character_set_client -latin1 SET @@session.character_set_client = @session_start_value; -SELECT @@session.character_set_client; -@@session.character_set_client -latin1 |