Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä 2021-09-11 17:55:27 +03:00
commit 15139964d5
241 changed files with 5669 additions and 10038 deletions

View file

@ -850,8 +850,8 @@ bool recv_sys_t::recover_deferred(recv_sys_t::map::iterator &p,
!my_test_if_thinly_provisioned(node->handle);
#endif
if (!os_file_set_size(node->name, node->handle,
size * fil_space_t::physical_size(flags),
is_sparse))
(size * fil_space_t::physical_size(flags)) &
~4095ULL, is_sparse))
{
space->release();
goto fail;