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
18a68a24
Commit
18a68a24
authored
Apr 22, 2010
by
sbains
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
branches/innodb+: Add a check for thread suspended time to the list of checks
for slot recycle. Udpate the comments.
parent
02de8ecf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
srv/srv0srv.c
srv/srv0srv.c
+8
-5
No files found.
srv/srv0srv.c
View file @
18a68a24
...
...
@@ -2264,10 +2264,11 @@ srv_lock_check_wait(
trx_t
*
trx
;
double
wait_time
;
ulong
lock_wait_timeout
;
ib_time_t
suspend_time
=
slot
->
suspend_time
;
ut_ad
(
srv_sys_mutex_own
());
wait_time
=
ut_difftime
(
ut_time
(),
s
lot
->
s
uspend_time
);
wait_time
=
ut_difftime
(
ut_time
(),
suspend_time
);
trx
=
thr_get_trx
(
slot
->
thr
);
...
...
@@ -2307,16 +2308,18 @@ srv_lock_check_wait(
/* We can't compare the pointers here because the
memory can be recycled. Transaction ids are not
recyled and therefore safe to use. If the transaction
has already released its locks there is nothing
more we can do. */
recyled and therefore safe to use. We also check if
the transaction suspend time is the same that we
used for calculating the wait earlier. If the
transaction has already released its locks there
is nothing more we can do. */
if
(
slot
->
in_use
&&
suspend_time
==
slot
->
suspend_time
&&
ut_dulint_cmp
(
trx
->
id
,
slot_trx
->
id
)
==
0
&&
trx
->
wait_lock
!=
NULL
)
{
ut_a
(
trx
->
que_state
==
TRX_QUE_LOCK_WAIT
);
/* Note that the caller is the timeout thread */
lock_cancel_waiting_and_release
(
trx
->
wait_lock
);
}
...
...
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