|
1 | 1 | /*****************************************************************************
|
2 | 2 |
|
3 | 3 | Copyright (c) 1996, 2022, Oracle and/or its affiliates.
|
4 |
| -Copyright (c) 2014, 2022, MariaDB Corporation. |
| 4 | +Copyright (c) 2014, 2023, MariaDB Corporation. |
5 | 5 |
|
6 | 6 | This program is free software; you can redistribute it and/or modify it under
|
7 | 7 | the terms of the GNU General Public License as published by the Free Software
|
@@ -720,8 +720,6 @@ UNIV_INLINE
|
720 | 720 | bool
|
721 | 721 | lock_rec_has_to_wait(
|
722 | 722 | /*=================*/
|
723 |
| - bool for_locking, |
724 |
| - /*!< in is called locking or releasing */ |
725 | 723 | const trx_t* trx, /*!< in: trx of new lock */
|
726 | 724 | ulint type_mode,/*!< in: precise mode of the new lock
|
727 | 725 | to set: LOCK_S or LOCK_X, possibly
|
@@ -877,7 +875,7 @@ lock_has_to_wait(
|
877 | 875 | }
|
878 | 876 |
|
879 | 877 | return lock_rec_has_to_wait(
|
880 |
| - false, lock1->trx, lock1->type_mode, lock2, |
| 878 | + lock1->trx, lock1->type_mode, lock2, |
881 | 879 | lock_rec_get_nth_bit(lock1, PAGE_HEAP_NO_SUPREMUM));
|
882 | 880 | }
|
883 | 881 |
|
@@ -1168,7 +1166,7 @@ lock_rec_other_has_conflicting(
|
1168 | 1166 | lock != NULL;
|
1169 | 1167 | lock = lock_rec_get_next(heap_no, lock)) {
|
1170 | 1168 |
|
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)) { |
1172 | 1170 | #ifdef WITH_WSREP
|
1173 | 1171 | if (trx->is_wsrep()) {
|
1174 | 1172 | trx_mutex_enter(lock->trx);
|
|
0 commit comments