From f9a25dda9f8f58556b8779e267f5d65ecfbb8fee Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Wed, 22 Jan 2014 11:30:19 -0800
Subject: [PATCH] Fix wrong merge

---
 db/db_impl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/db_impl.cc b/db/db_impl.cc
index 5cdb8ae2d..d57adaae4 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -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;