diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /vio/viosocket.c | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'vio/viosocket.c')
| -rw-r--r-- | vio/viosocket.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 5576dfc48d8..e724165612c 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -137,6 +137,9 @@ int vio_socket_io_wait(Vio *vio, enum enum_vio_io_event event) #define VIO_DONTWAIT 0 #endif +/* + returns number of bytes read or -1 in case of an error +*/ size_t vio_read(Vio *vio, uchar *buf, size_t size) { ssize_t ret; |