database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#23303391: HANDLE_FATAL_SIGNAL (SIG=11) IN ALLOC_QUERY

Browse Source 
USING CHARACTER-SET-SERVER=UTF16

This is a backport of Bug#15985752 to mysql-5.5
This commit is contained in:
Arun Kuruvila
2016-08-29 11:41:50 +05:30
parent 7603ac53c8
commit aeab9d6b41
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_acl.cc
View File

@ -8789,7 +8789,10 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
{
mpvio->client_capabilities= uint4korr(end);
mpvio->max_client_packet_length= 0xfffff;
charset_code= default_charset_info->number;
charset_code= global_system_variables.character_set_client->number;
sql_print_warning("Client failed to provide its character set. "
"'%s' will be used as client character set.",
global_system_variables.character_set_client->csname);
if (mpvio->charset_adapter->init_client_charset(charset_code))
return packet_error;
goto skip_to_ssl;
@ -8826,7 +8829,10 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
Old clients didn't have their own charset. Instead the assumption
was that they used what ever the server used.
*/
charset_code= default_charset_info->number;
charset_code= global_system_variables.character_set_client->number;
sql_print_warning("Client failed to provide its character set. "
"'%s' will be used as client character set.",
global_system_variables.character_set_client->csname);
}
DBUG_EXECUTE_IF("host_error_charset",
{