diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 10:41:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 10:41:11 +0200 |
| commit | fc1403d3a9ef3230324396f621f72f02097c8a6a (patch) | |
| tree | 752bfc20e40a6bcb88f780823bf11215dc4477f9 | |
| parent | 1188ef4ade88dd42eb9cd05daa9a627aca1a4935 (diff) | |
| download | mariadb-git-fc1403d3a9ef3230324396f621f72f02097c8a6a.tar.gz | |
Cleanup: Remove fil_space_t::is_deferred()
The public data member can be checked directly by the only caller.
| -rw-r--r-- | extra/mariabackup/fil_cur.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/include/fil0fil.h | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index 824fb4f4232..31afd39faf1 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -420,7 +420,7 @@ read_retry: goto func_exit; } - defer = space->is_deferred(); + defer = UT_LIST_GET_FIRST(space->chain)->deferred; /* check pages for corruption and re-read if necessary. i.e. in case of partially written pages */ for (page = cursor->buf, i = 0; i < npages; diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 551768c3a22..7837020fec4 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -510,10 +510,6 @@ public: /** @return whether the storage device is rotational (HDD, not SSD) */ inline bool is_rotational() const; - /** whether the tablespace discovery is being deferred during crash - recovery due to incompletely written page 0 */ - inline bool is_deferred() const; - /** Open each file. Never invoked on .ibd files. @param create_new_db whether to skip the call to fil_node_t::read_page0() @return whether all files were opened */ @@ -1191,11 +1187,6 @@ inline bool fil_space_t::is_rotational() const return false; } -inline bool fil_space_t::is_deferred() const -{ - return UT_LIST_GET_FIRST(chain)->deferred; -} - /** Common InnoDB file extensions */ enum ib_extention { NO_EXT = 0, |