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 /sql/sql_connect.cc | |
| 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 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index ac50c7bd8f5..807b028a4b1 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -837,14 +837,10 @@ bool thd_init_client_charset(THD *thd, uint cs_number) Use server character set and collation if - opt_character_set_client_handshake is not set - client has not specified a character set - - client character set is the same as the servers - client character set doesn't exists in server */ if (!opt_character_set_client_handshake || - !(cs= get_charset(cs_number, MYF(0))) || - !my_strcasecmp(&my_charset_latin1, - global_system_variables.character_set_client->name, - cs->name)) + !(cs= get_charset(cs_number, MYF(0)))) { thd->variables.character_set_client= global_system_variables.character_set_client; |