mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'sensssz-10.2-vats' into 10.2

Browse source
This commit is contained in:
Jan Lindström 2016-12-07 09:19:27 +02:00
commit 9ea5de3096
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/lock/lock0lock.cc
View file

@ -1754,9 +1754,9 @@ RecLock::lock_alloc(
/*********************************************************************//**
Check if lock1 has higher priority than lock2.
NULL has lowest priority.
If either is a high priority transaction, the lock has higher priority.
If neither of them is wait lock, the first one has higher priority.
If only one of them is a wait lock, it has lower priority.
If either is a high priority transaction, the lock has higher priority.
Otherwise, the one with an older transaction has higher priority.
@returns true if lock1 has higher priority, false otherwise. */
bool
@ -1769,12 +1769,15 @@ has_higher_priority(
} else if (lock2 == NULL) {
return true;
}
// No preference. Compre them by wait mode and trx age.
// Granted locks has higher priority.
if (!lock_get_wait(lock1)) {
return true;
} else if (!lock_get_wait(lock2)) {
return false;
}
if (trx_is_high_priority(lock1->trx)) {
return false;
}
return lock1->trx->start_time_micro <= lock2->trx->start_time_micro;
}