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

into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
8eae9822 · msvensson@pilot.blaudden · a311b3fe · 006afd71 · 8eae9822
Commit 8eae9822 authored May 25, 2007 by msvensson@pilot.blaudden
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/mysql_com.h include/mysql_com.h +2 -0

No files found.
--- 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