diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:43:12 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:43:12 +0200 |
| commit | 71eb1afef15c103ff096104eef22049b8b4b0957 (patch) | |
| tree | c8363ff07bf3105b416bf81980b0f9609df81738 /include/mysql_com.h | |
| parent | a27fd67b512bace048a8c9b0cce7faf5cbbd1373 (diff) | |
| parent | 945f3c2cc827ca6acc06a1034538f4ec1388ac5b (diff) | |
| download | mariadb-git-71eb1afef15c103ff096104eef22049b8b4b0957.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
include/mysql_com.h:
Auto merged
include/violite.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
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_repl.cc:
Auto merged
vio/viosocket.c:
Auto merged
sql/sql_parse.cc:
Merge 5.0->5.1
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 2223dbad6ab..86843c8b632 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -353,6 +353,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 |