diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:57:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-24 20:57:10 +0200 |
| commit | b767ffb8ba4588aced4f1fd514aced987f1f42be (patch) | |
| tree | 7d982c9c35ebac02aefaf22170405a9b74990d3b /sql/sql_connect.cc | |
| parent | 71eb1afef15c103ff096104eef22049b8b4b0957 (diff) | |
| download | mariadb-git-b767ffb8ba4588aced4f1fd514aced987f1f42be.tar.gz | |
Rename two occurences of net_set_*_timeout that has changed file
between 5.0 and 5.1 and thus missed the merge
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 6c07c6ba6d5..28fd1f13cef 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -936,8 +936,8 @@ bool login_connection(THD *thd) net->no_send_error= 0; /* Use "connect_timeout" value during connection phase */ - net_set_read_timeout(net, connect_timeout); - net_set_write_timeout(net, connect_timeout); + my_net_set_read_timeout(net, connect_timeout); + my_net_set_write_timeout(net, connect_timeout); if ((error=check_connection(thd))) { // Wrong permissions @@ -951,8 +951,8 @@ bool login_connection(THD *thd) DBUG_RETURN(1); } /* Connect completed, set read/write timeouts back to default */ - net_set_read_timeout(net, thd->variables.net_read_timeout); - net_set_write_timeout(net, thd->variables.net_write_timeout); + my_net_set_read_timeout(net, thd->variables.net_read_timeout); + my_net_set_write_timeout(net, thd->variables.net_write_timeout); DBUG_RETURN(0); } |