diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
commit | 87a61355e8e499baf7908862711c26aa0225bf32 (patch) | |
tree | 7122052c801b5f1ee4a93af2348fad916aa2f86b /storage/innobase/include/row0row.h | |
parent | 7ea413ac2d80c7f03d1dbad90ac30ecddd8b2835 (diff) | |
parent | bc43bf3e430c20bc2178e584215bd443054709d6 (diff) | |
download | mariadb-git-87a61355e8e499baf7908862711c26aa0225bf32.tar.gz |
Merge 10.3 into 10.4
The MDEV-17062 fix in commit c4195305b2a8431f39a4c75cc1c66ba43685f7a0
was omitted.
Diffstat (limited to 'storage/innobase/include/row0row.h')
-rw-r--r-- | storage/innobase/include/row0row.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h index 264cae52832..be451751f56 100644 --- a/storage/innobase/include/row0row.h +++ b/storage/innobase/include/row0row.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2019, MariaDB Corporation. +Copyright (c) 2016, 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 @@ -208,8 +208,6 @@ row_rec_to_index_entry_low( const rec_t* rec, /*!< in: record in the index */ const dict_index_t* index, /*!< in: index */ const offset_t* offsets,/*!< in: rec_get_offsets(rec, index) */ - ulint* n_ext, /*!< out: number of externally - stored columns */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ MY_ATTRIBUTE((warn_unused_result)); @@ -223,8 +221,6 @@ row_rec_to_index_entry( const rec_t* rec, /*!< in: record in the index */ const dict_index_t* index, /*!< in: index */ const offset_t* offsets,/*!< in/out: rec_get_offsets(rec) */ - ulint* n_ext, /*!< out: number of externally - stored columns */ mem_heap_t* heap) /*!< in: memory heap from which the memory needed is allocated */ MY_ATTRIBUTE((warn_unused_result)); @@ -233,7 +229,6 @@ row_rec_to_index_entry( @param[in] rec metadata record @param[in] index clustered index after instant ALTER TABLE @param[in] offsets rec_get_offsets(rec) -@param[out] n_ext number of externally stored fields @param[in,out] heap memory heap for allocations @param[in] info_bits the info_bits after an update @param[in] pad whether to pad to index->n_fields */ @@ -242,7 +237,6 @@ row_metadata_to_tuple( const rec_t* rec, const dict_index_t* index, const offset_t* offsets, - ulint* n_ext, mem_heap_t* heap, ulint info_bits, bool pad) |