Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
This commit is contained in:
commit
5a222bcf72
@ -656,7 +656,11 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
|
|||||||
{
|
{
|
||||||
ssl.getSocket().wait(); // wait for input if blocking
|
ssl.getSocket().wait(); // wait for input if blocking
|
||||||
uint ready = ssl.getSocket().get_ready();
|
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
|
// add buffered data if its there
|
||||||
uint buffSz = buffered.get() ? buffered.get()->get_size() : 0;
|
uint buffSz = buffered.get() ? buffered.get()->get_size() : 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user