summaryrefslogtreecommitdiff
path: root/storage/innobase/include/fsp0space.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-07-05 14:35:55 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-07-05 14:35:55 +0300
commite3d3147792ebe56cbdd8ab52f123bed36e85e00c (patch)
tree19b0b32c398d1b578a693d0bcdc7ccda09cd9071 /storage/innobase/include/fsp0space.h
parentf2931b1e3acbd4d7ffdfac75e27efce1ea19583b (diff)
downloadmariadb-git-e3d3147792ebe56cbdd8ab52f123bed36e85e00c.tar.gz
MDEV-13105 InnoDB fails to load a table with PAGE_COMPRESSION_LEVEL after upgrade from 10.1.20
When using innodb_page_size=16k, InnoDB tables that were created in MariaDB 10.1.0 to 10.1.20 with PAGE_COMPRESSED=1 and PAGE_COMPRESSION_LEVEL=2 or PAGE_COMPRESSION_LEVEL=3 would fail to load. fsp_flags_is_valid(): When using innodb_page_size=16k, use a more strict check for .ibd files, with the assumption that nobody would try to use different-page-size files.
Diffstat (limited to 'storage/innobase/include/fsp0space.h')
-rw-r--r--storage/innobase/include/fsp0space.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/fsp0space.h b/storage/innobase/include/fsp0space.h
index 2c28ecc5c7b..9f869fda158 100644
--- a/storage/innobase/include/fsp0space.h
+++ b/storage/innobase/include/fsp0space.h
@@ -129,7 +129,7 @@ public:
@param[in] fsp_flags tablespace flags */
void set_flags(ulint fsp_flags)
{
- ut_ad(fsp_flags_is_valid(fsp_flags));
+ ut_ad(fsp_flags_is_valid(fsp_flags, false));
m_flags = fsp_flags;
}