diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-11 08:37:27 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-11 08:37:27 +0200 |
| commit | b218dfead2c57bc412107bebefd6ac33d2270dc6 (patch) | |
| tree | 6be058f2b7cfceeafb62e3708a0768fc9d01ec28 | |
| parent | 56948ee54c9d113f07f725ebdc560d1919fc6676 (diff) | |
| download | mariadb-git-b218dfead2c57bc412107bebefd6ac33d2270dc6.tar.gz | |
Remove an unused parameter
lock_rec_has_to_wait(): Remove the unused parameter for_locking
that had been originally added
in commit df4dd593f29aec8e2116aec1775ad4b8833d8c93
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 2fd2ef94365..2073380eadb 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2022, Oracle and/or its affiliates. -Copyright (c) 2014, 2022, MariaDB Corporation. +Copyright (c) 2014, 2023, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -720,8 +720,6 @@ UNIV_INLINE bool lock_rec_has_to_wait( /*=================*/ - bool for_locking, - /*!< in is called locking or releasing */ const trx_t* trx, /*!< in: trx of new lock */ ulint type_mode,/*!< in: precise mode of the new lock to set: LOCK_S or LOCK_X, possibly @@ -877,7 +875,7 @@ lock_has_to_wait( } return lock_rec_has_to_wait( - false, lock1->trx, lock1->type_mode, lock2, + lock1->trx, lock1->type_mode, lock2, lock_rec_get_nth_bit(lock1, PAGE_HEAP_NO_SUPREMUM)); } @@ -1168,7 +1166,7 @@ lock_rec_other_has_conflicting( lock != NULL; lock = lock_rec_get_next(heap_no, lock)) { - if (lock_rec_has_to_wait(true, trx, mode, lock, is_supremum)) { + if (lock_rec_has_to_wait(trx, mode, lock, is_supremum)) { #ifdef WITH_WSREP if (trx->is_wsrep()) { trx_mutex_enter(lock->trx); |