andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wrong merge

Browse Source
This commit is contained in:
Igor Canadi 2014-01-22 11:30:19 -08:00
parent 92a022ad07
commit f9a25dda9f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_impl.cc
View File

@ -3946,7 +3946,7 @@ Status DB::OpenWithColumnFamilies(
return s; return s;
} }
impl->mutex_.Lock(); impl->mutex_.Lock();
s = impl->Recover(); // Handles create_if_missing, error_if_exists s = impl->Recover(column_families); // Handles create_if_missing, error_if_exists
if (s.ok()) { if (s.ok()) {
uint64_t new_log_number = impl->versions_->NewFileNumber(); uint64_t new_log_number = impl->versions_->NewFileNumber();
unique_ptr<WritableFile> lfile; unique_ptr<WritableFile> lfile;