diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 21:16:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 21:16:22 +0300 |
| commit | 7bcaa541aa1f298abf8e863566a19b3e9ec2f659 (patch) | |
| tree | 066d58ad89536edf0e9a3de898506735c933381f /vio | |
| parent | 36b8ac2c0d763a3f96b254cb6e2cbdbc40dde22b (diff) | |
| parent | 2c3c851d2cba73825f81cd06220138b15c17ae4d (diff) | |
| download | mariadb-git-7bcaa541aa1f298abf8e863566a19b3e9ec2f659.tar.gz | |
Merge 10.4 into 10.5
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 c4d55901a16..2d240688ce0 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -934,7 +934,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. |