diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 10:08:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 10:08:57 +0200 |
| commit | 3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (patch) | |
| tree | 883e5c638ae861638582aba6e6534377e2564706 /storage/innobase/include/row0merge.h | |
| parent | 0a20e5ab77f8a6532b41ea2518626397059ccf42 (diff) | |
| parent | f0aa073f2bf3d8d85b3d028df89cdb4cdfc4002d (diff) | |
| download | mariadb-git-3466b47b0d2f0aca0a2191574c593c7eaea0b0b8.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/row0merge.h')
| -rw-r--r-- | storage/innobase/include/row0merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h index 27bd19252ac..fd9050d0a48 100644 --- a/storage/innobase/include/row0merge.h +++ b/storage/innobase/include/row0merge.h @@ -489,7 +489,7 @@ row_merge_read_rec( const mrec_t** mrec, /*!< out: pointer to merge record, or NULL on end of list (non-NULL on I/O error) */ - ulint* offsets,/*!< out: offsets of mrec */ + offset_t* offsets,/*!< out: offsets of mrec */ row_merge_block_t* crypt_block, /*!< in: crypt buf or NULL */ ulint space) /*!< in: space id */ MY_ATTRIBUTE((warn_unused_result)); |