Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
191fe00d
Commit
191fe00d
authored
Jul 01, 2011
by
Karen Langford
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small update to Patch to fix SS #12698716
parent
3ad6b7ab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
sql/sql_connect.cc
sql/sql_connect.cc
+3
-3
No files found.
sql/sql_connect.cc
View file @
191fe00d
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment