diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-29 14:33:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-29 15:11:06 +0300 |
| commit | 5fb4c0a8a877077e2835a9b39ac6e670fa4eaaac (patch) | |
| tree | 05c9ff96d83bcc0568e3c17016e9f4af8f057d2b /storage/innobase/lock | |
| parent | bdd6e33f00bff927358a7b03798a285ff41b35b7 (diff) | |
| download | mariadb-git-5fb4c0a8a877077e2835a9b39ac6e670fa4eaaac.tar.gz | |
Clean up ut_list
ut_list_validate(), ut_list_map(): Add variants with const Functor&
so that these functions can be called with an rvalue.
Remove wrapper macros, and add #ifdef UNIV_DEBUG around debug-only code.
Diffstat (limited to 'storage/innobase/lock')
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 22ec2ee7f06..67adee94d14 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -2738,7 +2738,7 @@ lock_move_granted_locks_to_front( if (!lock->is_waiting()) { lock_t* prev = UT_LIST_GET_PREV(trx_locks, lock); ut_a(prev); - UT_LIST_MOVE_TO_FRONT(lock_list, lock); + ut_list_move_to_front(lock_list, lock); lock = prev; } } @@ -2826,7 +2826,7 @@ lock_move_reorganize_page( lock_move_granted_locks_to_front(old_locks); DBUG_EXECUTE_IF("do_lock_reverse_page_reorganize", - UT_LIST_REVERSE(old_locks);); + ut_list_reverse(old_locks);); for (lock = UT_LIST_GET_FIRST(old_locks); lock; lock = UT_LIST_GET_NEXT(trx_locks, lock)) { |