Commit de108e05 authored by unknown's avatar unknown

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:
  Add checks to make sure net has a vio assigned
parent d8f21a94
...@@ -1123,7 +1123,8 @@ void my_net_set_read_timeout(NET *net, uint timeout) ...@@ -1123,7 +1123,8 @@ void my_net_set_read_timeout(NET *net, uint timeout)
DBUG_PRINT("enter", ("timeout: %d", timeout)); DBUG_PRINT("enter", ("timeout: %d", timeout));
net->read_timeout= timeout; net->read_timeout= timeout;
#ifdef NO_ALARM #ifdef NO_ALARM
vio_timeout(net->vio, 0, timeout); if (net->vio)
vio_timeout(net->vio, 0, timeout);
#endif #endif
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -1135,7 +1136,8 @@ void my_net_set_write_timeout(NET *net, uint timeout) ...@@ -1135,7 +1136,8 @@ void my_net_set_write_timeout(NET *net, uint timeout)
DBUG_PRINT("enter", ("timeout: %d", timeout)); DBUG_PRINT("enter", ("timeout: %d", timeout));
net->write_timeout= timeout; net->write_timeout= timeout;
#ifdef NO_ALARM #ifdef NO_ALARM
vio_timeout(net->vio, 1, timeout); if (net->vio)
vio_timeout(net->vio, 1, timeout);
#endif #endif
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
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