diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /storage/innobase/row/row0purge.cc | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/row/row0purge.cc')
| -rw-r--r-- | storage/innobase/row/row0purge.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc index def990a462c..36bbc6dbc0c 100644 --- a/storage/innobase/row/row0purge.cc +++ b/storage/innobase/row/row0purge.cc @@ -118,10 +118,10 @@ row_purge_remove_clust_if_poss_low( } rec_t* rec = btr_pcur_get_rec(&node->pcur); - ulint offsets_[REC_OFFS_NORMAL_SIZE]; + offset_t offsets_[REC_OFFS_NORMAL_SIZE]; rec_offs_init(offsets_); mem_heap_t* heap = NULL; - ulint* offsets = rec_get_offsets( + offset_t* offsets = rec_get_offsets( rec, index, offsets_, true, ULINT_UNDEFINED, &heap); bool success = true; @@ -665,9 +665,9 @@ static void row_purge_reset_trx_id(purge_node_t* node, mtr_t* mtr) mem_heap_t* heap = NULL; /* Reserve enough offsets for the PRIMARY KEY and 2 columns so that we can access DB_TRX_ID, DB_ROLL_PTR. */ - ulint offsets_[REC_OFFS_HEADER_SIZE + MAX_REF_PARTS + 2]; + offset_t offsets_[REC_OFFS_HEADER_SIZE + MAX_REF_PARTS + 2]; rec_offs_init(offsets_); - ulint* offsets = rec_get_offsets( + offset_t* offsets = rec_get_offsets( rec, index, offsets_, true, trx_id_pos + 2, &heap); ut_ad(heap == NULL); @@ -1202,7 +1202,7 @@ purge_node_t::validate_pcur() dict_index_t* clust_index = pcur.btr_cur.index; - ulint* offsets = rec_get_offsets( + offset_t* offsets = rec_get_offsets( pcur.old_rec, clust_index, NULL, true, pcur.old_n_fields, &heap); |