Commit a83ac4ce authored by Karen Langford's avatar Karen Langford

Small update to Patch to fix SS #12698716

parent da7b26bb
...@@ -957,16 +957,16 @@ static int check_connection(THD *thd) ...@@ -957,16 +957,16 @@ static int check_connection(THD *thd)
thd->client_capabilities= uint2korr(end); 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 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 packet read. In that case, skip reading those information. The below code
is patch for this. is patch for this.
*/ */
if(bytes_remaining_in_packet == AUTH_PACKET_HEADER_SIZE_CONNJ_SSL && 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->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; charset_code= default_charset_info->number;
end+= AUTH_PACKET_HEADER_SIZE_CONNJ_SSL; end+= AUTH_PACKET_HEADER_SIZE_CONNJ_SSL;
bytes_remaining_in_packet-= AUTH_PACKET_HEADER_SIZE_CONNJ_SSL; bytes_remaining_in_packet-= AUTH_PACKET_HEADER_SIZE_CONNJ_SSL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment