Commit 17b32e1a authored by unknown's avatar unknown
Browse files

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
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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;