diff options
Diffstat (limited to 'storage/innobase/row/row0row.cc')
| -rw-r--r-- | storage/innobase/row/row0row.cc | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index 4e901346580..83add52dd88 100644 --- a/storage/innobase/row/row0row.cc +++ b/storage/innobase/row/row0row.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2018, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2018, 2019, MariaDB Corporation. +Copyright (c) 2018, 2020, MariaDB Corporation. 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 @@ -722,7 +722,6 @@ row_rec_to_index_entry_impl( const rec_t* rec, const dict_index_t* index, const offset_t* offsets, - ulint* n_ext, mem_heap_t* heap, ulint info_bits = 0, bool pad = false) @@ -738,8 +737,6 @@ row_rec_to_index_entry_impl( /* Because this function may be invoked by row0merge.cc on a record whose header is in different format, the check rec_offs_validate(rec, index, offsets) must be avoided here. */ - ut_ad(n_ext); - *n_ext = 0; const bool got = mblob == 2 && rec_is_alter_metadata(rec, *index); ulint rec_len = rec_offs_n_fields(offsets); @@ -790,7 +787,6 @@ row_rec_to_index_entry_impl( if (rec_offs_nth_extern(offsets, i)) { dfield_set_ext(dfield); - ++*n_ext; } } @@ -833,7 +829,6 @@ init_metadata: ut_ad(len == FIELD_REF_SIZE); dfield_set_data(dfield, field, len); dfield_set_ext(dfield++); - ++*n_ext; copy_user_fields: for (; i < rec_len; i++, dfield++) { dict_col_copy_type(dict_index_get_nth_col(index, j++), @@ -851,7 +846,6 @@ copy_user_fields: if (rec_offs_nth_extern(offsets, i)) { dfield_set_ext(dfield); - ++*n_ext; } } } @@ -870,18 +864,15 @@ copy_user_fields: @param[in] rec index record @param[in] index index @param[in] offsets rec_get_offsets(rec, index) -@param[out] n_ext number of externally stored columns @param[in,out] heap memory heap for allocations */ dtuple_t* row_rec_to_index_entry_low( const rec_t* rec, const dict_index_t* index, const offset_t* offsets, - ulint* n_ext, mem_heap_t* heap) { - return row_rec_to_index_entry_impl<false>( - rec, index, offsets, n_ext, heap); + return row_rec_to_index_entry_impl<false>(rec, index, offsets, heap); } /*******************************************************************//** @@ -894,8 +885,6 @@ 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) */ - ulint* n_ext, /*!< out: number of externally - stored columns */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ { @@ -915,9 +904,9 @@ row_rec_to_index_entry( dtuple_t* entry = rec_is_alter_metadata(copy_rec, *index) ? row_rec_to_index_entry_impl<true,1>( - copy_rec, index, offsets, n_ext, heap) + copy_rec, index, offsets, heap) : row_rec_to_index_entry_impl<true>( - copy_rec, index, offsets, n_ext, heap); + copy_rec, index, offsets, heap); rec_offs_make_valid(rec, index, true, const_cast<offset_t*>(offsets)); @@ -932,7 +921,6 @@ row_rec_to_index_entry( @param[in] rec metadata record @param[in] index clustered index after instant ALTER TABLE @param[in] offsets rec_get_offsets(rec) -@param[out] n_ext number of externally stored fields @param[in,out] heap memory heap for allocations @param[in] info_bits the info_bits after an update @param[in] pad whether to pad to index->n_fields */ @@ -941,7 +929,6 @@ row_metadata_to_tuple( const rec_t* rec, const dict_index_t* index, const offset_t* offsets, - ulint* n_ext, mem_heap_t* heap, ulint info_bits, bool pad) @@ -962,9 +949,9 @@ row_metadata_to_tuple( dtuple_t* entry = info_bits == REC_INFO_METADATA_ALTER || rec_is_alter_metadata(copy_rec, *index) ? row_rec_to_index_entry_impl<true,2>( - copy_rec, index, offsets, n_ext, heap, info_bits, pad) + copy_rec, index, offsets, heap, info_bits, pad) : row_rec_to_index_entry_impl<true>( - copy_rec, index, offsets, n_ext, heap); + copy_rec, index, offsets, heap); rec_offs_make_valid(rec, index, true, const_cast<offset_t*>(offsets)); |