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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e15dd022
Commit
e15dd022
authored
Jul 22, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove use of non-portable gettimeofday() in thr_lock.c (Bug #12100)
parent
757f9400
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
mysys/thr_lock.c
mysys/thr_lock.c
+1
-6
No files found.
mysys/thr_lock.c
View file @
e15dd022
...
...
@@ -388,7 +388,6 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
{
struct
st_my_thread_var
*
thread_var
=
my_thread_var
;
pthread_cond_t
*
cond
=
&
thread_var
->
suspend
;
struct
timeval
now
;
struct
timespec
wait_timeout
;
enum
enum_thr_lock_result
result
=
THR_LOCK_ABORTED
;
my_bool
can_deadlock
=
test
(
data
->
owner
->
info
->
n_cursors
);
...
...
@@ -406,11 +405,7 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
data
->
cond
=
cond
;
if
(
can_deadlock
)
{
gettimeofday
(
&
now
,
0
);
wait_timeout
.
tv_sec
=
now
.
tv_sec
+
table_lock_wait_timeout
;
wait_timeout
.
tv_nsec
=
now
.
tv_usec
*
1000
;
}
set_timespec
(
wait_timeout
,
table_lock_wait_timeout
);
while
(
!
thread_var
->
abort
||
in_wait_list
)
{
int
rc
=
can_deadlock
?
pthread_cond_timedwait
(
cond
,
&
data
->
lock
->
mutex
,
...
...
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