mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.6 into 10.7

Browse source
This commit is contained in:
Marko Mäkelä 2021-10-27 14:08:52 +03:00
commit 3050d5e80e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/include/page0page.h
View file

@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (c) 1994, 2019, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2020, MariaDB Corporation.
Copyright (c) 2013, 2021, MariaDB Corporation.
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

6
storage/innobase/row/row0import.cc
View file

@ -3184,10 +3184,10 @@ static dberr_t handle_instant_metadata(dict_table_t *table,
return err;
}
const auto zip_size= fil_space_t::zip_size(space_flags);
const uint64_t physical_size= zip_size ? zip_size : srv_page_size;
const unsigned zip_size= fil_space_t::zip_size(space_flags);
const unsigned physical_size= zip_size ? zip_size : unsigned(srv_page_size);
ut_ad(physical_size <= UNIV_PAGE_SIZE_MAX);
const auto space_id= page_get_space_id(first_page.get());
const uint32_t space_id= page_get_space_id(first_page.get());
auto *space_crypt= fil_space_read_crypt_data(zip_size, first_page.get());
SCOPE_EXIT([&space_crypt]() {