diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-11-22 16:38:36 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-11-22 16:38:36 +0200 |
| commit | 57058cb6772ec4205c1b0bade761f5bf65772748 (patch) | |
| tree | 44dca5e8b3a7d350dcff31cefabd62734e770215 /storage/innobase/include/fil0fil.ic | |
| parent | ee3c99dfc7703de7f09a40ccdc6e0b65f5e987a7 (diff) | |
| download | mariadb-git-57058cb6772ec4205c1b0bade761f5bf65772748.tar.gz | |
MDEV-10377: innodb.innodb_blob_truncate fails in buildbot: Failing assertion: page_type == 34354 || page_type == 37401 || page_type == 17855 || page_type == 2 || page_type == 3 || ...
Page type FIL_PAGE_TYPE_ZBLOB2 was missing from assertion.
Diffstat (limited to 'storage/innobase/include/fil0fil.ic')
| -rw-r--r-- | storage/innobase/include/fil0fil.ic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/include/fil0fil.ic b/storage/innobase/include/fil0fil.ic index 5654d8f6178..ceebf6c1ab3 100644 --- a/storage/innobase/include/fil0fil.ic +++ b/storage/innobase/include/fil0fil.ic @@ -131,6 +131,7 @@ fil_page_type_validate( page_type == FIL_PAGE_TYPE_XDES || page_type == FIL_PAGE_TYPE_BLOB || page_type == FIL_PAGE_TYPE_ZBLOB || + page_type == FIL_PAGE_TYPE_ZBLOB2 || page_type == FIL_PAGE_TYPE_COMPRESSED))) { uint key_version = mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION); @@ -165,6 +166,7 @@ fil_page_type_validate( page_type == FIL_PAGE_TYPE_XDES || page_type == FIL_PAGE_TYPE_BLOB || page_type == FIL_PAGE_TYPE_ZBLOB || + page_type == FIL_PAGE_TYPE_ZBLOB2 || page_type == FIL_PAGE_TYPE_COMPRESSED); return false; } |