diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-25 11:41:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-25 11:41:10 +0200 |
| commit | 3d47b207972a0fba73473d8a7e2ca4b581ca051c (patch) | |
| tree | 15e4d31ca9d5bdfee787b81278282edfab18204d /include/mysql_com.h | |
| parent | 45400cb93469fb26a32a1b79e0f706f246fc047b (diff) | |
| parent | d8f21a949ae42aba60bbfb667a7f4b34606db68b (diff) | |
| download | mariadb-git-3d47b207972a0fba73473d8a7e2ca4b581ca051c.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
include/mysql_com.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 |