diff options
Diffstat (limited to 'storage/innobase/include/fsp0file.h')
| -rw-r--r-- | storage/innobase/include/fsp0file.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/storage/innobase/include/fsp0file.h b/storage/innobase/include/fsp0file.h index 974de9c75ed..8f9d45365f5 100644 --- a/storage/innobase/include/fsp0file.h +++ b/storage/innobase/include/fsp0file.h @@ -66,8 +66,7 @@ public: m_first_page_buf(), m_first_page(), m_last_os_error(), - m_file_info(), - m_crypt_info() + m_file_info() { /* No op */ } @@ -89,8 +88,7 @@ public: m_first_page_buf(), m_first_page(), m_last_os_error(), - m_file_info(), - m_crypt_info() + m_file_info() { ut_ad(m_name != NULL); /* No op */ @@ -110,8 +108,7 @@ public: m_first_page_buf(), m_first_page(), m_last_os_error(), - m_file_info(), - m_crypt_info() + m_file_info() { m_name = mem_strdup(file.m_name); ut_ad(m_name != NULL); @@ -169,8 +166,6 @@ public: it should be reread if needed */ m_first_page_buf = NULL; m_first_page = NULL; - /* Do not copy crypt info it is read from first page */ - m_crypt_info = NULL; return(*this); } @@ -321,11 +316,6 @@ public: return(m_last_os_error); } - fil_space_crypt_t* get_crypt_info() const - { - return(m_crypt_info); - } - /** Test if the filepath provided looks the same as this filepath by string comparison. If they are two different paths to the same file, same_as() will be used to show that after the files are opened. @@ -339,6 +329,11 @@ public: @return true if it is the same file, else false */ bool same_as(const Datafile& other) const; + const byte* get_first_page() const + { + return (m_first_page); + } + private: /** Free the filepath buffer. */ void free_filepath(); @@ -465,9 +460,6 @@ public: /* Use field st_ino. */ struct stat m_file_info; #endif /* WIN32 */ - - /** Encryption information */ - fil_space_crypt_t* m_crypt_info; }; |