diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
| commit | 2c3c851d2cba73825f81cd06220138b15c17ae4d (patch) | |
| tree | 4130cf52868c41beb3c242ad229031cca73d7e1c /vio | |
| parent | 474290540a829edcc6a74be8c354053f330bf5de (diff) | |
| parent | 8648b9bed86e9f52c027daec760d6ab5ce52e889 (diff) | |
| download | mariadb-git-2c3c851d2cba73825f81cd06220138b15c17ae4d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 9ef703dee8d..aedcf01b455 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -914,7 +914,7 @@ static my_bool socket_peek_read(Vio *vio, uint *bytes) @param timeout Interval (in milliseconds) to wait for an I/O event. A negative timeout value means an infinite timeout. - @remark sock_errno is set to SOCKET_ETIMEDOUT on timeout. + @remark socket_errno is set to SOCKET_ETIMEDOUT on timeout. @return A three-state value which indicates the operation status. @retval -1 Failure, socket_errno indicates the error. |