diff options
| author | msvensson@pilot.blaudden <> | 2007-05-24 20:43:12 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-24 20:43:12 +0200 |
| commit | 5d22eb6552ef44ed932235b06d938e5e3a169689 (patch) | |
| tree | c8363ff07bf3105b416bf81980b0f9609df81738 /include/violite.h | |
| parent | e2d216450a71660f9de3c9e3094453a3c80042d5 (diff) | |
| parent | 93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c (diff) | |
| download | mariadb-git-5d22eb6552ef44ed932235b06d938e5e3a169689.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/violite.h b/include/violite.h index 04365213ec0..a7ed021aa16 100644 --- a/include/violite.h +++ b/include/violite.h @@ -88,7 +88,6 @@ my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port); /* Remotes in_addr */ void vio_in_addr(Vio *vio, struct in_addr *in); my_bool vio_poll_read(Vio *vio,uint timeout); -void vio_timeout(Vio *vio,uint which, uint timeout); #ifdef HAVE_OPENSSL #include <openssl/opensslv.h> |