Merge src/leveldb changes for LevelDB 1.18.

2014-10-16 12:23:50 -07:00
parent e8f6d54f1f 4b0e2d75d7
commit 5b9f8425a5
40 changed files with 602 additions and 282 deletions
--- a/src/leveldb/db/log_format.h
+++ b/src/leveldb/db/log_format.h
@@ -26,8 +26,8 @@ static const int kMaxRecordType = kLastType;

 static const int kBlockSize = 32768;

-// Header is checksum (4 bytes), type (1 byte), length (2 bytes).
-static const int kHeaderSize = 4 + 1 + 2;
+// Header is checksum (4 bytes), length (2 bytes), type (1 byte).
+static const int kHeaderSize = 4 + 2 + 1;

 }  // namespace log
 }  // namespace leveldb