diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-01 01:10:37 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-01 16:52:19 +0300 |
commit | 2b27ac8282ed81b1b0c65e748d66498b81b85cee (patch) | |
tree | 7c4b94e0507fe71392a045477fabdcfbcd80b802 /storage/innobase/lock/lock0prdt.cc | |
parent | 87b0434e0f6ddcf0801355eb08d39c4fd02dd4e9 (diff) | |
download | mariadb-git-2b27ac8282ed81b1b0c65e748d66498b81b85cee.tar.gz |
Fix many -Wunused-parameter
Remove unused InnoDB function parameters and functions.
i_s_sys_virtual_fill_table(): Do not allocate heap memory.
mtr_is_block_fix(): Replace with mtr_memo_contains().
mtr_is_page_fix(): Replace with mtr_memo_contains_page().
Diffstat (limited to 'storage/innobase/lock/lock0prdt.cc')
-rw-r--r-- | storage/innobase/lock/lock0prdt.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/storage/innobase/lock/lock0prdt.cc b/storage/innobase/lock/lock0prdt.cc index 8f70049e714..6add60fb885 100644 --- a/storage/innobase/lock/lock0prdt.cc +++ b/storage/innobase/lock/lock0prdt.cc @@ -628,7 +628,6 @@ lock_prdt_update_parent( buf_block_t* right_block, /*!< in/out: the new half page */ lock_prdt_t* left_prdt, /*!< in: MBR on the old page */ lock_prdt_t* right_prdt, /*!< in: MBR on the new page */ - lock_prdt_t* parent_prdt, /*!< in: original parent MBR */ ulint space, /*!< in: parent space id */ ulint page_no) /*!< in: parent page number */ { @@ -682,7 +681,6 @@ static void lock_prdt_update_split_low( /*=======================*/ - buf_block_t* block, /*!< in/out: page to be split */ buf_block_t* new_block, /*!< in/out: the new half page */ lock_prdt_t* prdt, /*!< in: MBR on the old page */ lock_prdt_t* new_prdt, /*!< in: MBR on the new page */ @@ -759,17 +757,16 @@ Update predicate lock when page splits */ void lock_prdt_update_split( /*===================*/ - buf_block_t* block, /*!< in/out: page to be split */ buf_block_t* new_block, /*!< in/out: the new half page */ lock_prdt_t* prdt, /*!< in: MBR on the old page */ lock_prdt_t* new_prdt, /*!< in: MBR on the new page */ ulint space, /*!< in: space id */ ulint page_no) /*!< in: page number */ { - lock_prdt_update_split_low(block, new_block, prdt, new_prdt, + lock_prdt_update_split_low(new_block, prdt, new_prdt, space, page_no, LOCK_PREDICATE); - lock_prdt_update_split_low(block, new_block, NULL, NULL, + lock_prdt_update_split_low(new_block, NULL, NULL, space, page_no, LOCK_PRDT_PAGE); } @@ -811,9 +808,8 @@ lock_prdt_lock( SELECT FOR UPDATE */ ulint type_mode, /*!< in: LOCK_PREDICATE or LOCK_PRDT_PAGE */ - que_thr_t* thr, /*!< in: query thread + que_thr_t* thr) /*!< in: query thread (can be NULL if BTR_NO_LOCKING_FLAG) */ - mtr_t* mtr) /*!< in/out: mini-transaction */ { trx_t* trx = thr_get_trx(thr); dberr_t err = DB_SUCCESS; |