Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
b69026d2
Commit
b69026d2
authored
May 24, 2007
by
msvensson@pilot.blaudden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename two occurences of net_set_*_timeout that has changed file
between 5.0 and 5.1 and thus missed the merge
parent
5d22eb65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
sql/sql_connect.cc
sql/sql_connect.cc
+4
-4
No files found.
sql/sql_connect.cc
View file @
b69026d2
...
@@ -936,8 +936,8 @@ bool login_connection(THD *thd)
...
@@ -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)
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment