diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 11:22:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 11:22:09 +0300 |
| commit | cee37b5d26453538dc7830a20fa4c8da3d9285b7 (patch) | |
| tree | 39104c3e974c51410ecff151eafdd0a85a3824b9 /storage/innobase/include/fsp0fsp.h | |
| parent | 593885f785440358028999cb8d2c47d4b0a1e917 (diff) | |
| parent | 5f4314f0e6033e81361641a6731c0ef1656cc35c (diff) | |
| download | mariadb-git-cee37b5d26453538dc7830a20fa4c8da3d9285b7.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/include/fsp0fsp.h')
| -rw-r--r-- | storage/innobase/include/fsp0fsp.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index 10765852529..51333cb5955 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2020, MariaDB Corporation. +Copyright (c) 2013, 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 @@ -342,17 +342,6 @@ fsp_header_check_encryption_key( ulint fsp_flags, page_t* page); -/**********************************************************************//** -Writes the space id and flags to a tablespace header. The flags contain -row type, physical/compressed page size, and logical/uncompressed page -size of the tablespace. */ -void -fsp_header_init_fields( -/*===================*/ - page_t* page, /*!< in/out: first page in the space */ - ulint space_id, /*!< in: space id */ - ulint flags); /*!< in: tablespace flags (FSP_SPACE_FLAGS): - 0, or table->flags if newer than COMPACT */ /** Initialize a tablespace header. @param[in,out] space tablespace @param[in] size current size in blocks |