diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 15:46:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 15:46:28 +0200 |
| commit | ccfbeafc45f98bdf01513b00d9f0c82f029cdbf4 (patch) | |
| tree | 88a88af3e2e08d5f19158998c9cc2575f09302bf /storage/innobase/row/row0merge.cc | |
| parent | 7887d45352ca86b2328ceedc40f07e941c5cb10a (diff) | |
| parent | 190a8312f598fc4892331225104297f6288f23ac (diff) | |
| download | mariadb-git-ccfbeafc45f98bdf01513b00d9f0c82f029cdbf4.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 9b54057ac07..d74adadedc6 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -300,7 +300,7 @@ row_merge_buf_encode( ulint size; ulint extra_size; - size = rec_get_converted_size_temp( + size = rec_get_converted_size_temp<false>( index, entry->fields, n_fields, &extra_size); ut_ad(size >= extra_size); @@ -313,7 +313,7 @@ row_merge_buf_encode( *(*b)++ = (byte) (extra_size + 1); } - rec_convert_dtuple_to_temp(*b + extra_size, index, + rec_convert_dtuple_to_temp<false>(*b + extra_size, index, entry->fields, n_fields); *b += size; @@ -788,7 +788,7 @@ row_merge_buf_add( ulint size; ulint extra; - size = rec_get_converted_size_temp( + size = rec_get_converted_size_temp<false>( index, entry->fields, n_fields, &extra); ut_ad(data_size + extra_size == size); |