Commit b218dfea authored by Marko Mäkelä's avatar Marko Mäkelä

Remove an unused parameter

lock_rec_has_to_wait(): Remove the unused parameter for_locking
that had been originally added
in commit df4dd593
parent 56948ee5
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2022, Oracle and/or its affiliates. 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 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 the terms of the GNU General Public License as published by the Free Software
...@@ -720,8 +720,6 @@ UNIV_INLINE ...@@ -720,8 +720,6 @@ UNIV_INLINE
bool bool
lock_rec_has_to_wait( lock_rec_has_to_wait(
/*=================*/ /*=================*/
bool for_locking,
/*!< in is called locking or releasing */
const trx_t* trx, /*!< in: trx of new lock */ const trx_t* trx, /*!< in: trx of new lock */
ulint type_mode,/*!< in: precise mode of the new lock ulint type_mode,/*!< in: precise mode of the new lock
to set: LOCK_S or LOCK_X, possibly to set: LOCK_S or LOCK_X, possibly
...@@ -877,7 +875,7 @@ lock_has_to_wait( ...@@ -877,7 +875,7 @@ lock_has_to_wait(
} }
return lock_rec_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)); lock_rec_get_nth_bit(lock1, PAGE_HEAP_NO_SUPREMUM));
} }
...@@ -1168,7 +1166,7 @@ lock_rec_other_has_conflicting( ...@@ -1168,7 +1166,7 @@ lock_rec_other_has_conflicting(
lock != NULL; lock != NULL;
lock = lock_rec_get_next(heap_no, lock)) { 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 #ifdef WITH_WSREP
if (trx->is_wsrep()) { if (trx->is_wsrep()) {
trx_mutex_enter(lock->trx); trx_mutex_enter(lock->trx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment