1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename two occurences of net_set_*_timeout that has changed file

Browse Source 
between 5.0 and 5.1 and thus missed the merge
This commit is contained in:
unknown 2007-05-24 20:57:10 +02:00
parent 71eb1afef1
commit b767ffb8ba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_connect.cc
View File

@ -936,8 +936,8 @@ bool login_connection(THD *thd)
net->no_send_error= 0; net->no_send_error= 0;
/* Use "connect_timeout" value during connection phase */ /* Use "connect_timeout" value during connection phase */
net_set_read_timeout(net, connect_timeout); my_net_set_read_timeout(net, connect_timeout);
net_set_write_timeout(net, connect_timeout); my_net_set_write_timeout(net, connect_timeout);
if ((error=check_connection(thd))) if ((error=check_connection(thd)))
{ // Wrong permissions { // Wrong permissions
@ -951,8 +951,8 @@ bool login_connection(THD *thd)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
/* Connect completed, set read/write timeouts back to default */ /* Connect completed, set read/write timeouts back to default */
net_set_read_timeout(net, thd->variables.net_read_timeout); my_net_set_read_timeout(net, thd->variables.net_read_timeout);
net_set_write_timeout(net, thd->variables.net_write_timeout); my_net_set_write_timeout(net, thd->variables.net_write_timeout);
DBUG_RETURN(0); DBUG_RETURN(0);
} }