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
0a769b00
Commit
0a769b00
authored
Oct 12, 2016
by
sensssz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get thd by lock->trx->mysql_thd.
parent
5dc7ad87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
storage/innobase/lock/lock0lock.cc
storage/innobase/lock/lock0lock.cc
+1
-1
storage/xtradb/lock/lock0lock.cc
storage/xtradb/lock/lock0lock.cc
+1
-1
No files found.
storage/innobase/lock/lock0lock.cc
View file @
0a769b00
...
...
@@ -2008,7 +2008,7 @@ has_higher_priority(
return
true
;
}
// Ask the upper server layer if any of the two trx should be prefered.
int
preference
=
thd_deadlock_victim_preference
(
lock1
->
t
hd
,
lock2
->
thd
);
int
preference
=
thd_deadlock_victim_preference
(
lock1
->
t
rx
->
mysql_thd
,
lock2
->
trx
->
mysql_
thd
);
if
(
preference
==
-
1
)
{
// lock1 is preferred as a victim, so lock2 has higher priority
return
false
;
...
...
storage/xtradb/lock/lock0lock.cc
View file @
0a769b00
...
...
@@ -2031,7 +2031,7 @@ has_higher_priority(
return
true
;
}
// Ask the upper server layer if any of the two trx should be prefered.
int
preference
=
thd_deadlock_victim_preference
(
lock1
->
t
hd
,
lock2
->
thd
);
int
preference
=
thd_deadlock_victim_preference
(
lock1
->
t
rx
->
mysql_thd
,
lock2
->
trx
->
mysql_
thd
);
if
(
preference
==
-
1
)
{
// lock1 is preferred as a victim, so lock2 has higher priority
return
false
;
...
...
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