diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-28 13:54:18 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-28 13:54:18 +0500 |
| commit | 1328c29e946df6553e5204c0d3b34803001945eb (patch) | |
| tree | 113fa0806e9a3ee57d69fa7d8f3f6f4c808d6911 /sql/sql_parse.cc | |
| parent | 15b3f3a0d8c11babff0f2e4dfa81c1716bcf533d (diff) | |
| download | mariadb-git-1328c29e946df6553e5204c0d3b34803001945eb.tar.gz | |
"mysql" now sends client character set to server.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 78b6a03e2fa..b1e0b2dc91d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -664,8 +664,17 @@ check_connections(THD *thd) thd->max_client_packet_length= uint4korr(net->read_pos+4); if (!(thd->variables.character_set_client= get_charset((uint) net->read_pos[8], MYF(0)))) + { thd->variables.character_set_client= global_system_variables.character_set_client; + thd->variables.collation_connection= + global_system_variables.collation_connection; + } + else + { + thd->variables.collation_connection= + thd->variables.character_set_client; + } end= (char*) net->read_pos+32; } else |