diff options
author | msvensson@pilot.blaudden <> | 2007-05-24 11:21:27 +0200 |
---|---|---|
committer | msvensson@pilot.blaudden <> | 2007-05-24 11:21:27 +0200 |
commit | 93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c (patch) | |
tree | b344506ca47d428ac52b3ed42e0688a171e767a0 /include/violite.h | |
parent | 9abaacca9cc7b44c66c0289f483cc13d9f5b64ab (diff) | |
download | mariadb-git-93b1fe65d82661f29b1f6e1ad341eb0f68f4c93c.tar.gz |
Bug#26664 test suite times out on OS X 64bit
- The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'my_net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.
- Move declaration of 'vio_timeout' into "vio_priv.h"
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 63388c170c9..e0172008565 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> |