summaryrefslogtreecommitdiff
path: root/storage/innobase/fsp/fsp0file.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-02-03 08:55:36 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-02-06 10:45:18 +0200
commit3534500b87482dc7b43f72bcfc1faa08acfdff06 (patch)
treecd6335ac6084ab263c1d4c03a64b05fd6681f6c0 /storage/innobase/fsp/fsp0file.cc
parent5a21094a4319ba65f7568937ff57fa8b00c2483b (diff)
downloadmariadb-git-3534500b87482dc7b43f72bcfc1faa08acfdff06.tar.gz
Test recovery when a .ibd file is a directory.
Datafile::validate_for_recovery(): Remove a redundant error message. An error is already reported by Datafile::open_read_write() if the file cannot be opened. Also, do not assign SEARCH_ABORT, so that the full test will be executed even if one step fails.
Diffstat (limited to 'storage/innobase/fsp/fsp0file.cc')
-rw-r--r--storage/innobase/fsp/fsp0file.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc
index 22cd4862162..74c153a65d5 100644
--- a/storage/innobase/fsp/fsp0file.cc
+++ b/storage/innobase/fsp/fsp0file.cc
@@ -467,11 +467,8 @@ Datafile::validate_for_recovery()
close();
err = open_read_write(srv_read_only_mode);
if (err != DB_SUCCESS) {
- ib::error() << "Datafile '" << m_filepath << "' could not"
- " be opened in read-write mode so that the"
- " doublewrite pages could be restored.";
return(err);
- };
+ }
err = find_space_id();
if (err != DB_SUCCESS || m_space_id == 0) {