diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/r/character_set_server_func.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/character_set_server_func.result | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mysql-test/suite/sys_vars/r/character_set_server_func.result b/mysql-test/suite/sys_vars/r/character_set_server_func.result index 3731f27adae..f7267985aa2 100644 --- a/mysql-test/suite/sys_vars/r/character_set_server_func.result +++ b/mysql-test/suite/sys_vars/r/character_set_server_func.result @@ -2,16 +2,17 @@ SET @global_character_set_server = @@global.character_set_server; SET @session_character_set_server = @@session.character_set_server; SET @@global.character_set_server = utf8; -'connect (con1,localhost,root,,,,)' -'connection con1' +connect con1,localhost,root,,,,; +connection con1; SELECT @@global.character_set_server; @@global.character_set_server utf8 SELECT @@session.character_set_server; @@session.character_set_server utf8 +disconnect con1; '#--------------------FN_DYNVARS_009_02-------------------------#' -'connection default' +connection default; '---global character_set_server should not effects current connection---' SET @@global.character_set_server = utf8; CREATE DATABASE db1; @@ -35,8 +36,8 @@ select @@character_set_database; @@character_set_database utf8 '----test with new connection----' -'connect (con1,localhost,root,,,,)' -'connection con1' +connect con1,localhost,root,,,,; +connection con1; SELECT @@session.character_set_server; @@session.character_set_server utf8 @@ -60,6 +61,7 @@ DROP DATABASE db1; select @@character_set_database; @@character_set_database utf8 -'connection default;' +disconnect con1; +connection default; SET @@global.character_set_server = @global_character_set_server; SET @@session.character_set_server = @session_character_set_server; |