diff options
Diffstat (limited to 'storage/innobase/include/btr0cur.h')
| -rw-r--r-- | storage/innobase/include/btr0cur.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h index 5d10d26e025..03c8f7a6463 100644 --- a/storage/innobase/include/btr0cur.h +++ b/storage/innobase/include/btr0cur.h @@ -567,11 +567,11 @@ void btr_cur_node_ptr_delete(btr_cur_t* parent, mtr_t* mtr) /***********************************************************//** Parses a redo log record of updating a record in-place. @return end of log record or NULL */ -byte* +const byte* btr_cur_parse_update_in_place( /*==========================*/ - byte* ptr, /*!< in: buffer */ - byte* end_ptr,/*!< in: buffer end */ + const byte* ptr, /*!< in: buffer */ + const byte* end_ptr,/*!< in: buffer end */ page_t* page, /*!< in/out: page or NULL */ page_zip_des_t* page_zip,/*!< in/out: compressed page, or NULL */ dict_index_t* index); /*!< in: index corresponding to page */ @@ -579,11 +579,11 @@ btr_cur_parse_update_in_place( Parses the redo log record for delete marking or unmarking of a clustered index record. @return end of log record or NULL */ -byte* +const byte* btr_cur_parse_del_mark_set_clust_rec( /*=================================*/ - byte* ptr, /*!< in: buffer */ - byte* end_ptr,/*!< in: buffer end */ + const byte* ptr, /*!< in: buffer */ + const byte* end_ptr,/*!< in: buffer end */ page_t* page, /*!< in/out: page or NULL */ page_zip_des_t* page_zip,/*!< in/out: compressed page, or NULL */ dict_index_t* index); /*!< in: index corresponding to page */ @@ -591,11 +591,11 @@ btr_cur_parse_del_mark_set_clust_rec( Parses the redo log record for delete marking or unmarking of a secondary index record. @return end of log record or NULL */ -byte* +const byte* btr_cur_parse_del_mark_set_sec_rec( /*===============================*/ - byte* ptr, /*!< in: buffer */ - byte* end_ptr,/*!< in: buffer end */ + const byte* ptr, /*!< in: buffer */ + const byte* end_ptr,/*!< in: buffer end */ page_t* page, /*!< in/out: page or NULL */ page_zip_des_t* page_zip);/*!< in/out: compressed page, or NULL */ @@ -647,8 +647,7 @@ to free the field. */ void btr_cur_disown_inherited_fields( /*============================*/ - page_zip_des_t* page_zip,/*!< in/out: compressed page whose uncompressed - part will be updated, or NULL */ + buf_block_t* block, /*!< in/out: index page */ rec_t* rec, /*!< in/out: record in a clustered index */ dict_index_t* index, /*!< in: index of the page */ const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */ @@ -723,12 +722,12 @@ btr_free_externally_stored_field( page_zip_write_blob_ptr(), or NULL */ const offset_t* offsets, /*!< in: rec_get_offsets(rec, index), or NULL */ - page_zip_des_t* page_zip, /*!< in: compressed page corresponding - to rec, or NULL if rec == NULL */ + buf_block_t* block, /*!< in/out: page of field_ref */ ulint i, /*!< in: field number of field_ref; ignored if rec == NULL */ bool rollback, /*!< in: performing rollback? */ - mtr_t* local_mtr); /*!< in: mtr containing the latch */ + mtr_t* local_mtr) /*!< in: mtr containing the latch */ + MY_ATTRIBUTE((nonnull(1,2,5,8))); /** Copies the prefix of an externally stored field of a record. The clustered index record must be protected by a lock or a page latch. @@ -810,8 +809,6 @@ btr_rec_set_deleted_flag( /** Latches the leaf page or pages requested. @param[in] block leaf page where the search converged -@param[in] page_id page id of the leaf -@param[in] zip_size ROW_FORMAT=COMPRESSED page size, or 0 @param[in] latch_mode BTR_SEARCH_LEAF, ... @param[in] cursor cursor @param[in] mtr mini-transaction @@ -819,8 +816,6 @@ btr_rec_set_deleted_flag( btr_latch_leaves_t btr_cur_latch_leaves( buf_block_t* block, - const page_id_t page_id, - ulint zip_size, ulint latch_mode, btr_cur_t* cursor, mtr_t* mtr); |