diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-25 16:48:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-25 16:48:23 +0200 |
| commit | 7e96711aaf1467dbb01472dcb7f5e264f1a9f26e (patch) | |
| tree | b0f238bac516d18d817efe352b7aa77f6b01c2fc /sql/net_serv.cc | |
| parent | e673fcded57dd4ba5a83f7e36c275bb3d62954f4 (diff) | |
| parent | de108e05f9b7204ce572527765952c29b5fde289 (diff) | |
| download | mariadb-git-7e96711aaf1467dbb01472dcb7f5e264f1a9f26e.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
sql/net_serv.cc:
Auto merged
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; } |