diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
| commit | 9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35 (patch) | |
| tree | 68f8e54f6c2484dc7791bee8c594d3d07c611d29 /include/violite.h | |
| parent | 56990b18d914b8150c9f777d134724d2b3390360 (diff) | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| download | mariadb-git-9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index c7feca683cc..6d09621bea6 100644 --- a/include/violite.h +++ b/include/violite.h @@ -112,9 +112,7 @@ my_bool vio_peer_addr(Vio *vio, char *buf, uint16 *port, size_t buflen); /* Wait for an I/O event notification. */ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout); my_bool vio_is_connected(Vio *vio); -#ifndef DBUG_OFF ssize_t vio_pending(Vio *vio); -#endif /* Set timeout for a network operation. */ extern int vio_timeout(Vio *vio, uint which, int timeout_sec); extern void vio_set_wait_callback(void (*before_wait)(void), |