database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


sql/net_serv.cc:
  Auto merged
This commit is contained in:
unknown
2007-05-25 16:48:23 +02:00
parent e673fcded5 de108e05f9
commit 7e96711aaf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/net_serv.cc
View File

@@ -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;
}