Squashed 'src/leveldb/' changes from 7924331..7d41e6f

7d41e6f Merge upstream LevelDB 1.18 803d692 Release 1.18 git-subtree-dir: src/leveldb git-subtree-split: 7d41e6f89ff04ce9e6a742932924796f69c6e23d
2014-10-16 12:23:50 -07:00
parent 938b689846
commit 4b0e2d75d7
40 changed files with 602 additions and 282 deletions
--- a/util/bloom.cc
+++ b/util/bloom.cc
@@ -29,7 +29,7 @@ class BloomFilterPolicy : public FilterPolicy {
  }

  virtual const char* Name() const {
-    return "leveldb.BuiltinBloomFilter";
+    return "leveldb.BuiltinBloomFilter2";
  }

  virtual void CreateFilter(const Slice* keys, int n, std::string* dst) const {