Fix wrong merge

This commit is contained in:
Igor Canadi 2014-01-22 11:30:19 -08:00
parent 92a022ad07
commit f9a25dda9f

View File

@ -3946,7 +3946,7 @@ Status DB::OpenWithColumnFamilies(
return s;
}
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()) {
uint64_t new_log_number = impl->versions_->NewFileNumber();
unique_ptr<WritableFile> lfile;