diff options
| author | msvensson@pilot.blaudden <> | 2007-05-25 16:47:43 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-25 16:47:43 +0200 |
| commit | e50116e99e3b4a67a288159c9b6dab8fe94c904b (patch) | |
| tree | 5d609a9d10aa9f8dd2d54b17a6a557ef38db0d91 /sql/net_serv.cc | |
| parent | 006afd713d814f23b6524868ff51128117e64a40 (diff) | |
| download | mariadb-git-e50116e99e3b4a67a288159c9b6dab8fe94c904b.tar.gz | |
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
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |