Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashed

2013-07-01 08:36:32 -07:00
parent 28bcf3b7ef adae78ea99
commit fb1da62318
18 changed files with 190 additions and 59 deletions
--- a/src/leveldb/db/db_impl.h
+++ b/src/leveldb/db/db_impl.h
@@ -163,6 +163,7 @@ class DBImpl : public DB {

  // Have we encountered a background error in paranoid mode?
  Status bg_error_;
+  int consecutive_compaction_errors_;

  // Per level compaction stats.  stats_[level] stores the stats for
  // compactions that produced data for the specified "level".