1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
This commit is contained in:
paul@snake-hub.snake.net 2005-12-20 12:43:51 -06:00
commit 5a222bcf72
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extra/yassl/src/handshake.cpp
View File

@ -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;