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/handler | |
| parent | 0a20e5ab77f8a6532b41ea2518626397059ccf42 (diff) | |
| parent | f0aa073f2bf3d8d85b3d028df89cdb4cdfc4002d (diff) | |
| download | mariadb-git-3466b47b0d2f0aca0a2191574c593c7eaea0b0b8.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 63cb89d4e98..87bfab7bfec 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -2162,7 +2162,7 @@ innobase_rec_to_mysql( struct TABLE* table, /*!< in/out: MySQL table */ const rec_t* rec, /*!< in: record */ const dict_index_t* index, /*!< in: index */ - const ulint* offsets)/*!< in: rec_get_offsets( + const offset_t* offsets)/*!< in: rec_get_offsets( rec, index, ...) */ { uint n_fields = table->s->fields; @@ -4401,7 +4401,7 @@ innobase_add_instant_try( uf->field_no = f; uf->new_val = entry->fields[f]; } - ulint* offsets = NULL; + offset_t* offsets = NULL; mem_heap_t* offsets_heap = NULL; big_rec_t* big_rec; err = btr_cur_pessimistic_update( |