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
f62fd5ad
Commit
f62fd5ad
authored
Oct 19, 2016
by
sensssz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix: remove redundant code from check_deadlock_result. Remove assert.
parent
0f93b533
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
20 deletions
+1
-20
storage/innobase/lock/lock0lock.cc
storage/innobase/lock/lock0lock.cc
+1
-20
No files found.
storage/innobase/lock/lock0lock.cc
View file @
f62fd5ad
...
...
@@ -2080,23 +2080,7 @@ RecLock::check_deadlock_result(const trx_t* victim_trx, lock_t* lock)
return
(
DB_DEADLOCK
);
}
// Move it only when it does not cause a deadlock.
if
(
innodb_lock_schedule_algorithm
==
INNODB_LOCK_SCHEDULE_ALGORITHM_VATS
&&
!
trx_is_high_priority
(
lock
->
trx
))
{
HASH_DELETE
(
lock_t
,
hash
,
lock_hash_get
(
lock
->
type_mode
),
m_rec_id
.
fold
(),
lock
);
lock_rec_insert_by_trx_age
(
lock
,
m_mode
&
LOCK_WAIT
);
if
(
lock_get_wait
(
lock
)
&&
!
lock_rec_has_to_wait_in_queue
(
lock
))
{
lock_reset_lock_and_trx_wait
(
lock
);
return
DB_SUCCESS_LOCKED_REC
;
}
}
if
(
m_trx
->
lock
.
wait_lock
==
NULL
)
{
}
else
if
(
m_trx
->
lock
.
wait_lock
==
NULL
)
{
/* If there was a deadlock but we chose another
transaction as a victim, it is possible that we
...
...
@@ -3027,9 +3011,6 @@ lock_grant_and_move_on_page(
&&
lock_get_wait
(
lock
)
&&
!
lock_rec_has_to_wait_in_queue
(
lock
))
{
/* Grant the lock */
ut_ad
(
lock
->
trx
!=
in_lock
->
trx
);
bool
exit_trx_mutex
=
false
;
if
(
lock
->
trx
->
abort_type
!=
TRX_SERVER_ABORT
)
{
...
...
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