diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-05 14:35:55 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-05 14:55:56 +0300 |
commit | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (patch) | |
tree | 84467ec02335ca26faeaffd416bfc552faea6b22 /storage/xtradb/row | |
parent | 8ae9c86f2a79f1301f5428542fc7f53feed7d4f4 (diff) | |
download | mariadb-git-e555540ab6b9c3e0d4fdd00af093b115a9401d0a.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/xtradb/row')
-rw-r--r-- | storage/xtradb/row/row0import.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/row/row0import.cc b/storage/xtradb/row/row0import.cc index 86b2d782b7b..a99c72c01b5 100644 --- a/storage/xtradb/row/row0import.cc +++ b/storage/xtradb/row/row0import.cc @@ -549,7 +549,7 @@ AbstractCallback::init( const page_t* page = block->frame; m_space_flags = fsp_header_get_flags(page); - if (!fsp_flags_is_valid(m_space_flags)) { + if (!fsp_flags_is_valid(m_space_flags, true)) { ulint cflags = fsp_flags_convert_from_101(m_space_flags); if (cflags == ULINT_UNDEFINED) { ib_logf(IB_LOG_LEVEL_ERROR, |