diff options
Diffstat (limited to 'storage/innobase/row/row0row.cc')
| -rw-r--r-- | storage/innobase/row/row0row.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index 816e53a8d5e..774794be225 100644 --- a/storage/innobase/row/row0row.cc +++ b/storage/innobase/row/row0row.cc @@ -372,7 +372,7 @@ row_build_low( ulint type, const dict_index_t* index, const rec_t* rec, - const offset_t* offsets, + const rec_offs* offsets, const dict_table_t* col_table, const dtuple_t* add_cols, const dict_add_v_col_t* add_v, @@ -388,7 +388,7 @@ row_build_low( byte* buf; ulint j; mem_heap_t* tmp_heap = NULL; - offset_t offsets_[REC_OFFS_NORMAL_SIZE]; + rec_offs offsets_[REC_OFFS_NORMAL_SIZE]; rec_offs_init(offsets_); ut_ad(index != NULL); @@ -435,7 +435,7 @@ row_build_low( } /* Avoid a debug assertion in rec_offs_validate(). */ - rec_offs_make_valid(copy, index, const_cast<offset_t*>(offsets)); + rec_offs_make_valid(copy, index, const_cast<rec_offs*>(offsets)); if (!col_table) { ut_ad(!col_map); @@ -525,7 +525,7 @@ row_build_low( } } - rec_offs_make_valid(rec, index, const_cast<offset_t*>(offsets)); + rec_offs_make_valid(rec, index, const_cast<rec_offs*>(offsets)); ut_ad(dtuple_check_typed(row)); @@ -578,7 +578,7 @@ row_build( this record must be at least s-latched and the latch held as long as the row dtuple is used! */ - const offset_t* offsets,/*!< in: rec_get_offsets(rec,index) + const rec_offs* offsets,/*!< in: rec_get_offsets(rec,index) or NULL, in which case this function will invoke rec_get_offsets() */ const dict_table_t* col_table, @@ -631,7 +631,7 @@ row_build_w_add_vcol( ulint type, const dict_index_t* index, const rec_t* rec, - const offset_t* offsets, + const rec_offs* offsets, const dict_table_t* col_table, const dtuple_t* add_cols, const dict_add_v_col_t* add_v, @@ -652,7 +652,7 @@ row_rec_to_index_entry_low( /*=======================*/ const rec_t* rec, /*!< in: record in the index */ const dict_index_t* index, /*!< in: index */ - const offset_t* offsets,/*!< in: rec_get_offsets(rec, index) */ + const rec_offs* offsets,/*!< in: rec_get_offsets(rec, index) */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ { @@ -711,7 +711,7 @@ row_rec_to_index_entry( /*===================*/ const rec_t* rec, /*!< in: record in the index */ const dict_index_t* index, /*!< in: index */ - const offset_t* offsets,/*!< in: rec_get_offsets(rec) */ + const rec_offs* offsets,/*!< in: rec_get_offsets(rec) */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ { @@ -730,10 +730,10 @@ row_rec_to_index_entry( copy_rec = rec_copy(buf, rec, offsets); - rec_offs_make_valid(copy_rec, index, const_cast<offset_t*>(offsets)); + rec_offs_make_valid(copy_rec, index, const_cast<rec_offs*>(offsets)); entry = row_rec_to_index_entry_low( copy_rec, index, offsets, heap); - rec_offs_make_valid(rec, index, const_cast<offset_t*>(offsets)); + rec_offs_make_valid(rec, index, const_cast<rec_offs*>(offsets)); dtuple_set_info_bits(entry, rec_get_info_bits(rec, rec_offs_comp(offsets))); @@ -775,8 +775,8 @@ row_build_row_ref( ulint clust_col_prefix_len; ulint i; mem_heap_t* tmp_heap = NULL; - offset_t offsets_[REC_OFFS_NORMAL_SIZE]; - offset_t* offsets = offsets_; + rec_offs offsets_[REC_OFFS_NORMAL_SIZE]; + rec_offs* offsets = offsets_; rec_offs_init(offsets_); ut_ad(index != NULL); @@ -871,7 +871,7 @@ row_build_row_ref_in_tuple( held as long as the row reference is used! */ const dict_index_t* index, /*!< in: secondary index */ - offset_t* offsets,/*!< in: rec_get_offsets(rec, index) + rec_offs* offsets,/*!< in: rec_get_offsets(rec, index) or NULL */ trx_t* trx) /*!< in: transaction */ { @@ -884,7 +884,7 @@ row_build_row_ref_in_tuple( ulint clust_col_prefix_len; ulint i; mem_heap_t* heap = NULL; - offset_t offsets_[REC_OFFS_NORMAL_SIZE]; + rec_offs offsets_[REC_OFFS_NORMAL_SIZE]; rec_offs_init(offsets_); ut_ad(!dict_index_is_clust(index)); |