Skip to content

Commit b218dfe

Browse files
committed
Remove an unused parameter
lock_rec_has_to_wait(): Remove the unused parameter for_locking that had been originally added in commit df4dd59
1 parent 56948ee commit b218dfe

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

storage/innobase/lock/lock0lock.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1996, 2022, Oracle and/or its affiliates.
4-
Copyright (c) 2014, 2022, MariaDB Corporation.
4+
Copyright (c) 2014, 2023, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -720,8 +720,6 @@ UNIV_INLINE
720720
bool
721721
lock_rec_has_to_wait(
722722
/*=================*/
723-
bool for_locking,
724-
/*!< in is called locking or releasing */
725723
const trx_t* trx, /*!< in: trx of new lock */
726724
ulint type_mode,/*!< in: precise mode of the new lock
727725
to set: LOCK_S or LOCK_X, possibly
@@ -877,7 +875,7 @@ lock_has_to_wait(
877875
}
878876

879877
return lock_rec_has_to_wait(
880-
false, lock1->trx, lock1->type_mode, lock2,
878+
lock1->trx, lock1->type_mode, lock2,
881879
lock_rec_get_nth_bit(lock1, PAGE_HEAP_NO_SUPREMUM));
882880
}
883881

@@ -1168,7 +1166,7 @@ lock_rec_other_has_conflicting(
11681166
lock != NULL;
11691167
lock = lock_rec_get_next(heap_no, lock)) {
11701168

1171-
if (lock_rec_has_to_wait(true, trx, mode, lock, is_supremum)) {
1169+
if (lock_rec_has_to_wait(trx, mode, lock, is_supremum)) {
11721170
#ifdef WITH_WSREP
11731171
if (trx->is_wsrep()) {
11741172
trx_mutex_enter(lock->trx);

0 commit comments

Comments
 (0)