diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
| commit | ca091e6372c4d1b05d2338e878042c2914519a4e (patch) | |
| tree | 406c71091eb4fdf4409147d22e6749309f677e8e /vio | |
| parent | 28325b08633372cc343dfcbc41fe252020cf6e6e (diff) | |
| parent | d233fd14a39f9c583b85ffb03e42b5ea52e2f4c2 (diff) | |
| download | mariadb-git-ca091e6372c4d1b05d2338e878042c2914519a4e.tar.gz | |
Merge branch '10.1' into 10.2
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 6c028c48c46..f40474f3eec 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -879,7 +879,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. |