diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-19 12:06:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-19 12:06:13 +0200 |
| commit | b05bf8ff0f1acf39afeb71e0e8a148090364d8fc (patch) | |
| tree | d104ee5ed8a27edd28f716319f91992ef8880411 /storage/innobase/include/fsp0pagecompress.h | |
| parent | 833aa97cec771fbfb2ef8dd104de6a3d1e971daa (diff) | |
| parent | 03497129371fe2c16d847b7e83a5eeecab9c34a2 (diff) | |
| download | mariadb-git-b05bf8ff0f1acf39afeb71e0e8a148090364d8fc.tar.gz | |
Merge 10.1 to 10.2.
Most notably, this includes MDEV-11623, which includes a fix and
an upgrade procedure for the InnoDB file format incompatibility
that is present in MariaDB Server 10.1.0 through 10.1.20.
In other words, this merge should address
MDEV-11202 InnoDB 10.1 -> 10.2 migration does not work
Diffstat (limited to 'storage/innobase/include/fsp0pagecompress.h')
| -rw-r--r-- | storage/innobase/include/fsp0pagecompress.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/storage/innobase/include/fsp0pagecompress.h b/storage/innobase/include/fsp0pagecompress.h index 9038aa0fdef..b45a4b87890 100644 --- a/storage/innobase/include/fsp0pagecompress.h +++ b/storage/innobase/include/fsp0pagecompress.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (C) 2013, 2015, MariaDB Corporation. All Rights Reserved. +Copyright (C) 2013, 2017, MariaDB Corporation. All Rights Reserved. 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 @@ -48,15 +48,6 @@ fsp_header_get_compression_level( const page_t* page); /*!< in: first page of a tablespace */ /********************************************************************//** -Determine if the tablespace is page compressed from dict_table_t::flags. -@return TRUE if page compressed, FALSE if not compressed */ -UNIV_INLINE -bool -fsp_flags_is_page_compressed( -/*=========================*/ - ulint flags); /*!< in: tablespace flags */ - -/********************************************************************//** Extract the page compression level from tablespace flags. A tablespace has only one physical page compression level whether that page is compressed or not. |