diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-04-28 10:46:51 +1000 |
|---|---|---|
| committer | Robert Bindar <robert@mariadb.org> | 2020-04-29 12:02:47 +0300 |
| commit | ba2061da52d9dba06dfd454efc1332f7d6cf476c (patch) | |
| tree | 676a6d50d31d5f53263e5c2c158541f8b8986b03 /storage/innobase/trx | |
| parent | c238e9b96ab3660656ce440ed55f6380caa0f56b (diff) | |
| download | mariadb-git-ba2061da52d9dba06dfd454efc1332f7d6cf476c.tar.gz | |
MDEV-21595: innodb offset_t rename to rec_offs
thanks to:
perl -i -pe 's/\boffset_t\b/rec_offs/g' $(git grep -lw offset_t storage/innobase)
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0i_s.cc | 6 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0rec.cc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc index 540194f1dc2..7838ef4826d 100644 --- a/storage/innobase/trx/trx0i_s.cc +++ b/storage/innobase/trx/trx0i_s.cc @@ -599,7 +599,7 @@ put_nth_field( ulint n, /*!< in: number of field */ const dict_index_t* index, /*!< in: index */ const rec_t* rec, /*!< in: record */ - const offset_t* offsets)/*!< in: record offsets, returned + const rec_offs* offsets)/*!< in: record offsets, returned by rec_get_offsets() */ { const byte* data; @@ -680,8 +680,8 @@ fill_lock_data( const dict_index_t* index; ulint n_fields; mem_heap_t* heap; - offset_t offsets_onstack[REC_OFFS_NORMAL_SIZE]; - offset_t* offsets; + rec_offs offsets_onstack[REC_OFFS_NORMAL_SIZE]; + rec_offs* offsets; char buf[TRX_I_S_LOCK_DATA_MAX_LEN]; ulint buf_used; ulint i; diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index 3e41cb5ad1f..0ad9ff0dae8 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -848,7 +848,7 @@ trx_undo_page_report_modify( delete marking is done */ const rec_t* rec, /*!< in: clustered index record which has NOT yet been modified */ - const offset_t* offsets, /*!< in: rec_get_offsets(rec, index) */ + const rec_offs* offsets, /*!< in: rec_get_offsets(rec, index) */ const upd_t* update, /*!< in: update vector which tells the columns to be updated; in the case of a delete, this should be set to NULL */ @@ -2017,7 +2017,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 */ { @@ -2292,7 +2292,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 @@ -2475,7 +2475,7 @@ trx_undo_prev_version_build( } #if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG - offset_t offsets_dbg[REC_OFFS_NORMAL_SIZE]; + rec_offs offsets_dbg[REC_OFFS_NORMAL_SIZE]; rec_offs_init(offsets_dbg); ut_a(!rec_offs_any_null_extern( *old_vers, rec_get_offsets(*old_vers, index, offsets_dbg, true, |