mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Oleksandr Byelkin 2020-05-02 08:44:17 +02:00
commit ca091e6372
49 changed files with 2973 additions and 2657 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vio/viosocket.c
View file

@ -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.