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
7d39b280
Commit
7d39b280
authored
Jan 26, 2016
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MDEV-9468]: Client hangs in my_addr_resolve
Account for timeout of select returning a 0 error code.
parent
d2273993
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
mysys/my_addr_resolve.c
mysys/my_addr_resolve.c
+5
-1
No files found.
mysys/my_addr_resolve.c
View file @
7d39b280
...
@@ -175,6 +175,10 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
...
@@ -175,6 +175,10 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
sizeof
(
output
)
-
total_bytes_read
);
sizeof
(
output
)
-
total_bytes_read
);
if
(
extra_bytes_read
<
0
)
if
(
extra_bytes_read
<
0
)
return
1
;
return
1
;
/* Timeout or max bytes read. */
if
(
extra_bytes_read
==
0
)
break
;
total_bytes_read
+=
extra_bytes_read
;
total_bytes_read
+=
extra_bytes_read
;
}
}
...
@@ -183,7 +187,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
...
@@ -183,7 +187,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
return
1
;
return
1
;
/* Go through the addr2line response and get the required data.
/* Go through the addr2line response and get the required data.
The response is structured in 2 lnes. The first line contains the function
The response is structured in 2 l
i
nes. The first line contains the function
name, while the second one contains <filename>:<line number> */
name, while the second one contains <filename>:<line number> */
for
(
i
=
0
;
i
<
total_bytes_read
;
i
++
)
{
for
(
i
=
0
;
i
<
total_bytes_read
;
i
++
)
{
if
(
output
[
i
]
==
'\n'
)
{
if
(
output
[
i
]
==
'\n'
)
{
...
...
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