1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-28371 Assertion fold == id.fold() failed in buf_flush_check_neighbor()

Browse Source 
Due to 32-bit arithmetics, SRV_TMP_SPACE_ID page number 0x200002 would be
folded to 0, which is incompatible with the assumption that was made in
commit 7cffb5f6e8a231a041152447be8980ce35d2c9b8 (MDEV-23399).

page_id_t::fold(): Compute in the native word width instead of uint32_t.
On 64-bit platforms, an alternative would be to return the 64-bit m_id
directly, but that was measured to cause a performance regression.

fil_space_t::open(): Invoke fil_node_t::find_metadata() when the
tablespace is being created. In this way, we will actually detect
that the temporary tablespace resides on SSD. (During database
creation, also the system tablespace will correctly be detected as
residing on SSD.)
This commit is contained in:
Marko Mäkelä 2022-04-21 14:09:23 +03:00
parent 580cbd18b3
commit fdec842fd7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/fil/fil0fil.cc
View File

@ -1171,7 +1171,10 @@ err_exit:
}
if (create_new_db)
{
node->find_metadata(node->handle);
continue;
}
if (skip_read)
{
size+= node->size;

4
storage/innobase/include/buf0types.h
View File

@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2021, MariaDB Corporation.
Copyright (c) 2019, 2022, 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
@ -162,7 +162,7 @@ public:
/** Retrieve the fold value.
@return fold value */
ulint fold() const { return (space() << 20) + space() + page_no(); }
ulint fold() const { return (ulint{space()} << 20) + space() + page_no(); }
/** Reset the page number only.
@param[in] page_no page number */