diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 22:25:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 22:25:47 +0100 |
| commit | ea04a8cfda4963143e3fde38d5dec913c02d35ee (patch) | |
| tree | ce07046aa65b574e31de251758b911a59b194d2a /mysql-test/suite/sys_vars/r/collation_connection_func.result | |
| parent | a8bd285f7c0b65f76df0d81472eab270de12532c (diff) | |
| download | mariadb-git-ea04a8cfda4963143e3fde38d5dec913c02d35ee.tar.gz | |
MDEV-6805 one can set character_set_client to utf32
use the same restriction for character_set_client on the command line
and from SQL.
Also: remove strange hack from thd_init_client_charset() that contradicted
the manual (collation_connection and character_set_result were not always set)
Diffstat (limited to 'mysql-test/suite/sys_vars/r/collation_connection_func.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/collation_connection_func.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/collation_connection_func.result b/mysql-test/suite/sys_vars/r/collation_connection_func.result index 18f82dc60e1..b40efda517f 100644 --- a/mysql-test/suite/sys_vars/r/collation_connection_func.result +++ b/mysql-test/suite/sys_vars/r/collation_connection_func.result @@ -9,7 +9,7 @@ SELECT @@global.collation_connection; latin1_danish_ci SELECT @@session.collation_connection; @@session.collation_connection -latin1_danish_ci +latin1_swedish_ci '#--------------------FN_DYNVARS_015_02-------------------------#' 'connection default' DROP TABLE IF EXISTS t1; |