bk commit into 5.1 tree (msvensson:1.2508)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-25 11:41:10+02:00, msvensson@stripped +4 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2938.22

  include/mysql_com.h@stripped, 2007-05-25 11:41:07+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.100.1.14

  sql/item.cc@stripped, 2007-05-25 11:41:07+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.113.1.158

  sql/item.h@stripped, 2007-05-25 11:41:07+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.183.1.48

  sql/sql_yacc.yy@stripped, 2007-05-25 11:41:07+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.371.1.149

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.121/include/mysql_com.h	2007-05-24 20:38:48 +02:00
+++ 1.122/include/mysql_com.h	2007-05-25 11:41:07 +02:00
@@ -353,8 +353,10 @@ my_bool	net_write_command(NET *net,unsig
 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