diff options
| author | Karen Langford <karen.langford@oracle.com> | 2011-07-01 17:18:27 +0200 |
|---|---|---|
| committer | Karen Langford <karen.langford@oracle.com> | 2011-07-01 17:18:27 +0200 |
| commit | ae46a66099cfe66e9423a2cc9ef0c5e2097ae73d (patch) | |
| tree | 529e96e7ba21e489e07b97199fe7809f41a95550 /sql | |
| parent | 1660a3cbf676074a74f5df9862c87cb9136ce231 (diff) | |
| download | mariadb-git-ae46a66099cfe66e9423a2cc9ef0c5e2097ae73d.tar.gz | |
Small update to Patch to fix SS #12698716
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_connect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 51608718349..7912a11f7f2 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -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; |