diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 11:21:27 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 11:21:27 +0200 |
| commit | 945f3c2cc827ca6acc06a1034538f4ec1388ac5b (patch) | |
| tree | b344506ca47d428ac52b3ed42e0688a171e767a0 /include | |
| parent | 0ab74abc6395af5949d3797c6a9037f3317a0acd (diff) | |
| download | mariadb-git-945f3c2cc827ca6acc06a1034538f4ec1388ac5b.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"
include/mysql_com.h:
Move the net_set_*_timeout function declarations to mysql_com.h and
rename to my_net_set_*_timeout to avoid name clashes
include/violite.h:
Move declaration of 'vio_timeout' to vio_priv.h (to make
the function as private as possible)
libmysql/libmysql.c:
Use my_net_read_timeout or my_net_write_timeout when setting
the timeouts. Move the global variables for my_net_read/my_write_timeout
into the only place where they are used. Thus removing them...
server-tools/instance-manager/mysql_connection.cc:
Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
sql-common/client.c:
Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
sql/mysql_priv.h:
Move the net_set_*_timeout function declarations to mysql_com.h
sql/net_serv.cc:
No need to cast the net->write_timeout value from "uint" to "uint"
sql/set_var.cc:
Rename net_set_*_timeout to my_net_set_*_timeout
sql/sql_client.cc:
Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
sql/sql_parse.cc:
Rename net_set_*_timeout to my_net_set_*_timeout
sql/sql_repl.cc:
Rename net_set_*_timeout to my_net_set_*_timeout
vio/vio_priv.h:
Move declaration of 'vio_timeout' to vio_priv.h
vio/viosocket.c:
Cleanup 'vio_timeout'
- Use "const void*" on POSIX and "const char*" on windows for
setsockopt
- Add DBUG_PRINT's
- Add comment about why we don't have an implementation of
vio_timeout for platforms not supporting SO_SNDTIMEO or SO_RCVTIMEO
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 3 | ||||
| -rw-r--r-- | include/violite.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 93409b2ea1d..cea3a0739e3 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -345,6 +345,9 @@ my_bool net_write_command(NET *net,unsigned char command, int net_real_write(NET *net,const char *packet,unsigned long len); unsigned long my_net_read(NET *net); +void my_net_set_write_timeout(NET *net, uint timeout); +void my_net_set_read_timeout(NET *net, uint timeout); + /* The following function is not meant for normal usage Currently it's used internally by manager.c 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> |