From e50116e99e3b4a67a288159c9b6dab8fe94c904b Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Fri, 25 May 2007 16:47:43 +0200
Subject: 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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sql/net_serv.cc')

diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 9ee8a825b01..c56e9c0b073 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -1123,7 +1123,8 @@ void my_net_set_read_timeout(NET *net, uint timeout)
   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, uint timeout)
   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;
 }
-- 
cgit v1.2.1