diff options
| author | msvensson@pilot.blaudden <> | 2007-05-25 11:41:10 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-25 11:41:10 +0200 |
| commit | 8eae98225c27753456ebb1af614d970aab78e9b8 (patch) | |
| tree | 15e4d31ca9d5bdfee787b81278282edfab18204d /include/mysql_com.h | |
| parent | a311b3fefdc663ad012d9e7e3aa5ac199caf40b2 (diff) | |
| parent | 006afd713d814f23b6524868ff51128117e64a40 (diff) | |
| download | mariadb-git-8eae98225c27753456ebb1af614d970aab78e9b8.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 86843c8b632..d60426ae8e3 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -353,8 +353,10 @@ 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); +#ifdef _global_h void my_net_set_write_timeout(NET *net, uint timeout); void my_net_set_read_timeout(NET *net, uint timeout); +#endif /* The following function is not meant for normal usage |