diff options
Diffstat (limited to 'storage/innobase/os/os0file.cc')
| -rw-r--r-- | storage/innobase/os/os0file.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 44783f72972..5cbf5803577 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -4105,14 +4105,14 @@ corrupted: FSP_HEADER_OFFSET + FSP_SPACE_ID + page, 4) ? ULINT_UNDEFINED : mach_read_from_4(FIL_PAGE_SPACE_ID + page); - ulint flags= fsp_header_get_flags(page); + uint32_t flags= fsp_header_get_flags(page); const uint32_t size= fsp_header_get_field(page, FSP_SIZE); const uint32_t free_limit= fsp_header_get_field(page, FSP_FREE_LIMIT); const uint32_t free_len= flst_get_len(FSP_HEADER_OFFSET + FSP_FREE + page); if (!fil_space_t::is_valid_flags(flags, space->id)) { - ulint cflags= fsp_flags_convert_from_101(flags); - if (cflags == ULINT_UNDEFINED) + uint32_t cflags= fsp_flags_convert_from_101(flags); + if (cflags == UINT32_MAX) { invalid: ib::error() << "Expected tablespace flags " @@ -4122,8 +4122,8 @@ invalid: goto corrupted; } - ulint cf= cflags & ~FSP_FLAGS_MEM_MASK; - ulint sf= space->flags & ~FSP_FLAGS_MEM_MASK; + uint32_t cf= cflags & ~FSP_FLAGS_MEM_MASK; + uint32_t sf= space->flags & ~FSP_FLAGS_MEM_MASK; if (!fil_space_t::is_flags_equal(cf, sf) && !fil_space_t::is_flags_equal(sf, cf)) |