mirror of
https://github.com/MariaDB/server.git
synced 2025-09-11 05:52:26 +03:00
bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
sql_parse.cc: mysqld.cc: Added --skip-client-character-set-handshake. When this option is activated, client side character set (which is sent in handshake) is ignored, and server side default-character-set value is used for character_set_client and character_set_results, thus reprodicing 4.0 behaviour. sql/mysqld.cc: bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob Added --skip-client-character-set-handshake, to reproduce 4.0 behaviour. sql/sql_parse.cc: bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob Added --skip-client-character-set-handshake, to reproduce 4.0 behaviour.
This commit is contained in:
@@ -811,11 +811,13 @@ static int check_connection(THD *thd)
|
||||
DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));
|
||||
/*
|
||||
Use server character set and collation if
|
||||
- opt_skip_character_set_client_handshake is 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 (!(thd->variables.character_set_client=
|
||||
if (opt_skip_character_set_client_handshake ||
|
||||
!(thd->variables.character_set_client=
|
||||
get_charset((uint) net->read_pos[8], MYF(0))) ||
|
||||
!my_strcasecmp(&my_charset_latin1,
|
||||
global_system_variables.character_set_client->name,
|
||||
|
Reference in New Issue
Block a user