diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-14 10:15:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-14 10:15:50 +0200 |
| commit | d3afdb1e8f0ab5d2d5257ee931fe5d4d2ed82ced (patch) | |
| tree | 9fc2d47884ff7da0c8843206759bd77e80ecdef1 /storage/innobase | |
| parent | e63f621652b95f778960840300d7df4321c4f462 (diff) | |
| download | mariadb-git-d3afdb1e8f0ab5d2d5257ee931fe5d4d2ed82ced.tar.gz | |
Datafile::validate_first_page(): Change some ERROR to Note
On startup, if the InnoDB doublewrite buffer can be used to
recover a corrupted page, raising an ERROR about a recoverable
error seems inappropriate. Issue Note instead, and adjust
tests accordingly.
Also, correctly validate the tablespace ID in the files.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/fsp/fsp0file.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc index 4a8874d0fa5..b707588e2da 100644 --- a/storage/innobase/fsp/fsp0file.cc +++ b/storage/innobase/fsp/fsp0file.cc @@ -513,9 +513,9 @@ Datafile::validate_first_page(lsn_t* flush_lsn) if (error_txt != NULL) { err_exit: - ib::error() << error_txt << " in datafile: " << m_filepath + ib::info() << error_txt << " in datafile: " << m_filepath << ", Space ID:" << m_space_id << ", Flags: " - << m_flags << ". " << TROUBLESHOOT_DATADICT_MSG; + << m_flags; m_is_valid = false; free_first_page(); return(DB_CORRUPTION); @@ -562,8 +562,7 @@ err_exit: goto err_exit; } - if (m_space_id == ULINT_UNDEFINED) { - /* The space_id can be most anything, except -1. */ + if (m_space_id >= SRV_LOG_SPACE_FIRST_ID) { error_txt = "A bad Space ID was found"; goto err_exit; } |