From 00065d0d5d5f3e98f9463accb957a319c2602bf5 Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Mon, 13 Jan 2014 13:27:43 -0800
Subject: [PATCH] Fix merge test

Copy max_successive_merges from options to column family options
---
 util/options.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/options.cc b/util/options.cc
index bbc1291b3..96f86f5c6 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -69,7 +69,8 @@ ColumnFamilyOptions::ColumnFamilyOptions()
       table_factory(
         std::shared_ptr<TableFactory>(new BlockBasedTableFactory())),
       inplace_update_support(false),
-      inplace_update_num_locks(10000) {
+      inplace_update_num_locks(10000),
+      max_successive_merges(0) {
   assert(memtable_factory.get() != nullptr);
 }
 
@@ -129,7 +130,7 @@ ColumnFamilyOptions::ColumnFamilyOptions(const Options& options)
       table_properties_collectors(options.table_properties_collectors),
       inplace_update_support(options.inplace_update_support),
       inplace_update_num_locks(options.inplace_update_num_locks),
-      max_successive_merges(0) {
+      max_successive_merges(options.max_successive_merges) {
   assert(memtable_factory.get() != nullptr);
 }