diff options
| author | msvensson@pilot.blaudden <> | 2007-05-25 16:48:23 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-25 16:48:23 +0200 |
| commit | 4ac551f4992b87125d2929953e4888b27231b00a (patch) | |
| tree | b0f238bac516d18d817efe352b7aa77f6b01c2fc /sql/net_serv.cc | |
| parent | 792f6e349d184935cd5a3cdb1c9b0361180cc930 (diff) | |
| parent | e50116e99e3b4a67a288159c9b6dab8fe94c904b (diff) | |
| download | mariadb-git-4ac551f4992b87125d2929953e4888b27231b00a.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
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 88a3bdbf3e6..0f38f846515 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1126,7 +1126,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; } @@ -1138,7 +1139,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; } |