Commit b29a8118 authored by Marko Mäkelä's avatar Marko Mäkelä

Cleanup: Remove fil_space_t::magic_n

parent c86d1daa
...@@ -236,9 +236,7 @@ fil_space_get_by_id( ...@@ -236,9 +236,7 @@ fil_space_get_by_id(
mysql_mutex_assert_owner(&fil_system.mutex); mysql_mutex_assert_owner(&fil_system.mutex);
HASH_SEARCH(hash, &fil_system.spaces, id, HASH_SEARCH(hash, &fil_system.spaces, id,
fil_space_t*, space, fil_space_t*, space,, space->id == id);
ut_ad(space->magic_n == FIL_SPACE_MAGIC_N),
space->id == id);
return(space); return(space);
} }
...@@ -803,8 +801,6 @@ pfs_os_file_t fil_system_t::detach(fil_space_t *space, bool detach_handle) ...@@ -803,8 +801,6 @@ pfs_os_file_t fil_system_t::detach(fil_space_t *space, bool detach_handle)
else if (space == temp_space) else if (space == temp_space)
temp_space= nullptr; temp_space= nullptr;
ut_a(space->magic_n == FIL_SPACE_MAGIC_N);
for (fil_node_t* node= UT_LIST_GET_FIRST(space->chain); node; for (fil_node_t* node= UT_LIST_GET_FIRST(space->chain); node;
node= UT_LIST_GET_NEXT(chain, node)) node= UT_LIST_GET_NEXT(chain, node))
if (node->is_open()) if (node->is_open())
...@@ -943,7 +939,6 @@ fil_space_t *fil_space_t::create(ulint id, ulint flags, ...@@ -943,7 +939,6 @@ fil_space_t *fil_space_t::create(ulint id, ulint flags,
space->purpose = purpose; space->purpose = purpose;
space->flags = flags; space->flags = flags;
space->magic_n = FIL_SPACE_MAGIC_N;
space->crypt_data = crypt_data; space->crypt_data = crypt_data;
space->n_pending.store(CLOSING, std::memory_order_relaxed); space->n_pending.store(CLOSING, std::memory_order_relaxed);
......
...@@ -434,8 +434,6 @@ struct fil_space_t final ...@@ -434,8 +434,6 @@ struct fil_space_t final
/** Stores last page freed lsn. Protected by freed_mutex */ /** Stores last page freed lsn. Protected by freed_mutex */
lsn_t last_freed_lsn; lsn_t last_freed_lsn;
ulint magic_n;/*!< FIL_SPACE_MAGIC_N */
/** @return whether doublewrite buffering is needed */ /** @return whether doublewrite buffering is needed */
inline bool use_doublewrite() const; inline bool use_doublewrite() const;
...@@ -1085,9 +1083,6 @@ struct fil_space_t final ...@@ -1085,9 +1083,6 @@ struct fil_space_t final
}; };
#ifndef UNIV_INNOCHECKSUM #ifndef UNIV_INNOCHECKSUM
/** Value of fil_space_t::magic_n */
#define FIL_SPACE_MAGIC_N 89472
/** File node of a tablespace or the log data space */ /** File node of a tablespace or the log data space */
struct fil_node_t final struct fil_node_t final
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment