diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:51:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:51:37 +0200 |
| commit | 6c789278885423044a526a7ce543b30bcb0e425f (patch) | |
| tree | 2db80e621915e71c8554c6396c2ba02df01473a2 /include | |
| parent | e079e2049990159bc3c798303bcab7d954370235 (diff) | |
| parent | 945f3c2cc827ca6acc06a1034538f4ec1388ac5b (diff) | |
| download | mariadb-git-6c789278885423044a526a7ce543b30bcb0e425f.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
libmysql/libmysql.c:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
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> |