diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
| commit | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (patch) | |
| tree | 0777df9a8dc587b70851c1edc0cfe96895928717 /storage/innobase/row/row0vers.cc | |
| parent | 6053eb1ce278ac1f566cd74498506bf457d6d048 (diff) | |
| parent | f35d1721039f8f115fc55e8f4b4d2bb4012161d1 (diff) | |
| download | mariadb-git-66ec3a770f7854f500ece66c78f3c87c9cd6da15.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/row/row0vers.cc')
| -rw-r--r-- | storage/innobase/row/row0vers.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc index 4bbe0c8d717..6f070f7c7d8 100644 --- a/storage/innobase/row/row0vers.cc +++ b/storage/innobase/row/row0vers.cc @@ -93,7 +93,7 @@ row_vers_impl_x_locked_low( trx_id_t trx_id; rec_t* prev_version = NULL; rec_offs clust_offsets_[REC_OFFS_NORMAL_SIZE]; - rec_offs* clust_offsets = clust_offsets_; + rec_offs* clust_offsets; mem_heap_t* heap; dtuple_t* ientry = NULL; mem_heap_t* v_heap = NULL; @@ -115,7 +115,7 @@ row_vers_impl_x_locked_low( heap = mem_heap_create(1024); - clust_offsets = rec_get_offsets(clust_rec, clust_index, clust_offsets, + clust_offsets = rec_get_offsets(clust_rec, clust_index, clust_offsets_, true, ULINT_UNDEFINED, &heap); trx_id = row_get_rec_trx_id(clust_rec, clust_index, clust_offsets); @@ -204,7 +204,7 @@ row_vers_impl_x_locked_low( ut_ad(committed || prev_version || !rec_get_deleted_flag(version, comp)); - /* Free version. */ + /* Free version and clust_offsets. */ mem_heap_free(old_heap); if (committed) { @@ -239,7 +239,7 @@ not_locked: } clust_offsets = rec_get_offsets( - prev_version, clust_index, clust_offsets, true, + prev_version, clust_index, clust_offsets_, true, ULINT_UNDEFINED, &heap); vers_del = rec_get_deleted_flag(prev_version, comp); |