Skip to content

M
MariaDB
Commit 8eae9822 authored by msvensson@pilot.blaudden's avatar msvensson@pilot.blaudden
Browse files
Options

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
parents a311b3fe 006afd71
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
include/mysql_com.h
View file @ 8eae9822
...@@ -353,8 +353,10 @@ my_bool net_write_command(NET *net,unsigned char command, ...@@ -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); int net_real_write(NET *net,const char *packet,unsigned long len);
unsigned long my_net_read(NET *net); unsigned long my_net_read(NET *net);
#ifdef _global_h
void my_net_set_write_timeout(NET *net, uint timeout); void my_net_set_write_timeout(NET *net, uint timeout);
void my_net_set_read_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 The following function is not meant for normal usage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7