diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2016-03-25 20:51:22 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-03-31 10:11:16 +0400 |
commit | 282497dd6d1049b4fb963641504c2733752845a7 (patch) | |
tree | 7288d17c29fbbe9ac47ec51f6988fb954f59a361 /mysql-test/suite/sys_vars/r/collation_database_func.result | |
parent | 5052e2479e873461bebfcedbc674bbaf57d3c968 (diff) | |
download | mariadb-git-282497dd6d1049b4fb963641504c2733752845a7.tar.gz |
MDEV-6720 - enable connection log in mysqltest by default
Diffstat (limited to 'mysql-test/suite/sys_vars/r/collation_database_func.result')
-rw-r--r-- | mysql-test/suite/sys_vars/r/collation_database_func.result | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite/sys_vars/r/collation_database_func.result b/mysql-test/suite/sys_vars/r/collation_database_func.result index 38b1c7e22ba..99f0e253005 100644 --- a/mysql-test/suite/sys_vars/r/collation_database_func.result +++ b/mysql-test/suite/sys_vars/r/collation_database_func.result @@ -3,16 +3,17 @@ SET @global_collation_database = @@global.collation_database; SET @session_collation_database = @@session.collation_database; SET @session_collation_server = @@session.collation_server; SET @@global.collation_database = latin1_danish_ci; -'connect (con1,localhost,root,,,,)' -'connection con1' +connect con1,localhost,root,,,,; +connection con1; SELECT @@global.collation_database; @@global.collation_database latin1_danish_ci SELECT @@session.collation_database; @@session.collation_database latin1_swedish_ci +disconnect con1; '#--------------------FN_DYNVARS_011_02-------------------------#' -'connection default' +connection default; DROP TABLE IF EXISTS t1,t2; SELECT @@character_set_server,@@collation_server; @@character_set_server @@collation_server |