diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 10:33:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 10:33:59 +0300 |
| commit | 5008171b05e0d3b8b5f4af312b94a312281e77c7 (patch) | |
| tree | 4a551df68976e937d18a7416d799c7a5605cb12f /storage/innobase/include/page0cur.ic | |
| parent | 61f84bba603aa85957b48d151f9ddf5ba4e71ab1 (diff) | |
| parent | 13d0641710802bd57b0c0d88c9fc321932014994 (diff) | |
| download | mariadb-git-5008171b05e0d3b8b5f4af312b94a312281e77c7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/page0cur.ic')
| -rw-r--r-- | storage/innobase/include/page0cur.ic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/page0cur.ic b/storage/innobase/include/page0cur.ic index f0844ee1f73..e53f6d8f463 100644 --- a/storage/innobase/include/page0cur.ic +++ b/storage/innobase/include/page0cur.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2018, MariaDB Corporation. +Copyright (c) 2015, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -273,7 +273,8 @@ page_cur_tuple_insert( index, tuple, n_ext); *offsets = rec_get_offsets(rec, index, *offsets, - page_is_leaf(cursor->block->frame), + page_is_leaf(cursor->block->frame) + ? index->n_core_fields : 0, ULINT_UNDEFINED, heap); ut_ad(size == rec_offs_size(*offsets)); |