diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-02-27 19:38:39 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-02-27 19:38:39 +0200 |
| commit | e807bcf0e287c2ac729df010e56365800047e9f1 (patch) | |
| tree | 46b83cf5ddbcf0a93b5eb75bc079ef5cc56aa5ba /include | |
| parent | e6dad7043682a140ed907b3dd5a79904603fde33 (diff) | |
| parent | 1b9b2c3091fc580bff82ca0630221eabd5628d6c (diff) | |
| download | mariadb-git-e807bcf0e287c2ac729df010e56365800047e9f1.tar.gz | |
merging
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index 6c8ad1f4b69..f99bb521e23 100644 --- a/include/violite.h +++ b/include/violite.h @@ -95,7 +95,7 @@ my_socket vio_fd(Vio*vio); /* * Remote peer's address and name in text form. */ -my_bool vio_peer_addr(Vio* vio, char *buf); +my_bool vio_peer_addr(Vio* vio, char *buf, u_int16_t *port); /* Remotes in_addr */ @@ -119,7 +119,7 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #define vio_keepalive(vio, set_keep_alive) (vio)->viokeepalive(vio, set_keep_alive) #define vio_should_retry(vio) (vio)->should_retry(vio) #define vio_close(vio) ((vio)->vioclose)(vio) -#define vio_peer_addr(vio, buf) (vio)->peer_addr(vio, buf) +#define vio_peer_addr(vio, buf, prt) (vio)->peer_addr(vio, buf, prt) #define vio_in_addr(vio, in) (vio)->in_addr(vio, in) #endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */ |