database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

Small update to Patch to fix SS #12698716

Browse Source
This commit is contained in:
Karen Langford
2011-07-01 17:18:27 +02:00
parent da7b26bb6b
commit a83ac4ceb2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_connect.cc
View File

@ -957,16 +957,16 @@ static int check_connection(THD *thd)
thd->client_capabilities= uint2korr(end);
/*
JConnector only sends client capabilities (4 bytes) before starting SSL
Connector/J only sends client capabilities (4 bytes) before starting SSL
negotiation so we don't have char_set and other information for client in
packet read. In that case, skip reading those information. The below code
is patch for this.
*/
if(bytes_remaining_in_packet == AUTH_PACKET_HEADER_SIZE_CONNJ_SSL &&
thd->client_capabilities & CLIENT_SSL)
(thd->client_capabilities & CLIENT_SSL))
{
thd->client_capabilities= uint4korr(end);
thd->max_client_packet_length= 0xfffff;
thd->max_client_packet_length= global_system_variables.max_allowed_packet;
charset_code= default_charset_info->number;
end+= AUTH_PACKET_HEADER_SIZE_CONNJ_SSL;
bytes_remaining_in_packet-= AUTH_PACKET_HEADER_SIZE_CONNJ_SSL;