summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0rec.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-05-04 16:47:11 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-05-04 16:47:11 +0200
commit7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8 (patch)
treea4931bf9418b28824d3ff4c68f4a2d888b584f65 /storage/innobase/include/trx0rec.h
parent42bba9782b36247c6c2241ea4d5996723af273fd (diff)
parent5008fc709bca54bd29a4d3f35aebf6e25468b9dd (diff)
downloadmariadb-git-7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/innobase/include/trx0rec.h')
-rw-r--r--storage/innobase/include/trx0rec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index e2c2fbd8204..f27d8af0368 100644
--- a/storage/innobase/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
@@ -191,7 +191,7 @@ trx_undo_report_row_operation(
const rec_t* rec, /*!< in: case of an update or delete
marking, the record in the clustered
index; NULL if insert */
- const offset_t* offsets, /*!< in: rec_get_offsets(rec) */
+ const rec_offs* offsets, /*!< in: rec_get_offsets(rec) */
roll_ptr_t* roll_ptr) /*!< out: DB_ROLL_PTR to the
undo log record */
MY_ATTRIBUTE((nonnull(1,2,8), warn_unused_result));
@@ -224,7 +224,7 @@ trx_undo_prev_version_build(
index_rec page and purge_view */
const rec_t* rec, /*!< in: version of a clustered index record */
dict_index_t* index, /*!< in: clustered index */
- offset_t* offsets,/*!< in/out: rec_get_offsets(rec, index) */
+ rec_offs* offsets,/*!< in/out: rec_get_offsets(rec, index) */
mem_heap_t* heap, /*!< in: memory heap from which the memory
needed is allocated */
rec_t** old_vers,/*!< out, own: previous version, or NULL if