From: Date: May 25 2007 4:47pm
Subject: bk commit into 5.0 tree (msvensson:1.2500) BUG#26664
List-Archive: http://lists.mysql.com/commits/27343
X-Bug: 26664
Message-Id: <200705251447.l4PElkH4000992@pilot.blaudden>

Below is the list of changes that have just been committed into a local
5.0 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 16:47:43+02:00, msvensson@stripped +1 -0
  Bug#26664 test suite times out on OS X 64bit
   - Add checks to make sure net has a vio assigned
   - For example bootstrap will create a fake "net" with vio
     set to 0 

  sql/net_serv.cc@stripped, 2007-05-25 16:47:40+02:00, msvensson@stripped +4 -2
    Add checks to make sure net has a vio assigned

# 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.0-maint

--- 1.101/sql/net_serv.cc	2007-05-24 20:51:35 +02:00
+++ 1.102/sql/net_serv.cc	2007-05-25 16:47:40 +02:00
@@ -1123,7 +1123,8 @@ void my_net_set_read_timeout(NET *net, u
   DBUG_PRINT("enter", ("timeout: %d", timeout));
   net->read_timeout= timeout;
 #ifdef NO_ALARM
-  vio_timeout(net->vio, 0, timeout);
+  if (net->vio)
+    vio_timeout(net->vio, 0, timeout);
 #endif
   DBUG_VOID_RETURN;
 }
@@ -1135,7 +1136,8 @@ void my_net_set_write_timeout(NET *net, 
   DBUG_PRINT("enter", ("timeout: %d", timeout));
   net->write_timeout= timeout;
 #ifdef NO_ALARM
-  vio_timeout(net->vio, 1, timeout);
+  if (net->vio)
+    vio_timeout(net->vio, 1, timeout);
 #endif
   DBUG_VOID_RETURN;
 }