diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-18 16:56:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-18 16:56:16 +0200 |
| commit | 6373ec3ec74515574f8a08535ed0d090b13d9122 (patch) | |
| tree | d2a7393afdf99b7b609a9c911e16a121c862b403 /storage/innobase/include/btr0cur.h | |
| parent | e709eb9bf712006d070767629518f827cd2f6bed (diff) | |
| parent | d595a91bc6bfb9f9c38bf91738b2a563d80c62e0 (diff) | |
| download | mariadb-git-6373ec3ec74515574f8a08535ed0d090b13d9122.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/btr0cur.h')
| -rw-r--r-- | storage/innobase/include/btr0cur.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h index 2954f14b310..13a420fd912 100644 --- a/storage/innobase/include/btr0cur.h +++ b/storage/innobase/include/btr0cur.h @@ -1,7 +1,7 @@ /***************************************************************************** -Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2019, MariaDB Corporation. +Copyright (c) 1994, 2019, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, 2020, 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 @@ -784,18 +784,6 @@ btr_rec_copy_externally_stored_field( ulint* len, mem_heap_t* heap); -/*******************************************************************//** -Flags the data tuple fields that are marked as extern storage in the -update vector. We use this function to remember which fields we must -mark as extern storage in a record inserted for an update. -@return number of flagged external columns */ -ulint -btr_push_update_extern_fields( -/*==========================*/ - dtuple_t* tuple, /*!< in/out: data tuple */ - const upd_t* update, /*!< in: update vector */ - mem_heap_t* heap) /*!< in: memory heap */ - MY_ATTRIBUTE((nonnull)); /***********************************************************//** Sets a secondary index record's delete mark to the given value. This function is only used by the insert buffer merge mechanism. */ |