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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
17b32e1a
Commit
17b32e1a
authored
Dec 20, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
parents
3b94794f
28999410
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
extra/yassl/src/handshake.cpp
extra/yassl/src/handshake.cpp
+5
-1
No files found.
extra/yassl/src/handshake.cpp
View file @
17b32e1a
...
...
@@ -656,7 +656,11 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
{
ssl
.
getSocket
().
wait
();
// wait for input if blocking
uint
ready
=
ssl
.
getSocket
().
get_ready
();
if
(
!
ready
)
return
buffered
;
if
(
!
ready
)
{
// Nothing to receive after blocking wait => error
ssl
.
SetError
(
receive_error
);
return
buffered
=
null_buffer
;
}
// add buffered data if its there
uint
buffSz
=
buffered
.
get
()
?
buffered
.
get
()
->
get_size
()
:
0
;
...
...
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