diff --git a/ext/lsm1/lsm_sorted.c b/ext/lsm1/lsm_sorted.c index 7fc3114b38..f479f4ce8c 100644 --- a/ext/lsm1/lsm_sorted.c +++ b/ext/lsm1/lsm_sorted.c @@ -4038,7 +4038,7 @@ static int mergeWorkerWrite( if( flags ) lsmPutU16(&aData[SEGMENT_FLAGS_OFFSET(nData)], (u16)flags); /* Write the entry header into the current page. */ - aData[iOff++] = (u8)eType; /* 1 */ + aData[iOff++] = (u8)eType; /* 1 */ iOff += lsmVarintPut32(&aData[iOff], iRPtr); /* 2 */ iOff += lsmVarintPut32(&aData[iOff], nKey); /* 3 */ if( rtIsWrite(eType) ) iOff += lsmVarintPut32(&aData[iOff], nVal); /* 4 */ diff --git a/manifest b/manifest index 181cfa6613..03a4449371 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\smore\sharmless\scompiler\swarnings\sin\slsm1,\sseen\swith\sMSVC\s2015. -D 2017-07-11T16:46:41.623 +C Fix\sa\swhitespace\salignment\sissue\sin\slsm1. +D 2017-07-11T17:06:42.710 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba @@ -244,7 +244,7 @@ F ext/lsm1/lsm_main.c 15e73ccdafdd44ddeefc29e332079d88ba8f00c12c797b3c2b63d3171b F ext/lsm1/lsm_mem.c 4c51ea9fa285ee6e35301b33491642d071740a0a F ext/lsm1/lsm_mutex.c 378edf0a2b142b4f7640ee982df06d50b98788ea F ext/lsm1/lsm_shared.c 6b903d1afce9e254b642be7898359b4760afde6fb5740623bae4affff5726ab8 -F ext/lsm1/lsm_sorted.c 1bdd5668c27e36253d164b180ee3e0c5cf75964786d4777f25ef45c0d37e53a8 +F ext/lsm1/lsm_sorted.c a04518dfbfff0171fafb152a46e9fe9f45e1edbf3570e4533dd58ddb6567f0c9 F ext/lsm1/lsm_str.c 65e361b488c87b10bf3e5c0070b14ffc602cf84f094880bece77bbf6678bca82 F ext/lsm1/lsm_tree.c 682679d7ef2b8b6f2fe77aeb532c8d29695bca671c220b0abac77069de5fb9fb F ext/lsm1/lsm_unix.c 57361bcf5b1a1a028f5d66571ee490e9064d2cfb145a2cc9e5ddade467bb551b @@ -1631,7 +1631,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P cf6da4a52f7f9047e653ef2972e4c0910b29d7182d789a9e30225dc1849e8779 -R e3b76a73346e93609e0049aa729badac +P 0f1307f1f5638c1c4f1ce2b89cdef7ce8b76dc2a38685cd1ca152cde9e8727da +R 7400a8b15efac04f7b2e05c59db9c23f U mistachkin -Z 43b08d17226cf77572e88a78b7952b8a +Z 8bfcb6b9870f5a07cd83371a25e25bb8 diff --git a/manifest.uuid b/manifest.uuid index 210133996e..b01cd2aa9b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0f1307f1f5638c1c4f1ce2b89cdef7ce8b76dc2a38685cd1ca152cde9e8727da \ No newline at end of file +a8e651e0e52b016c3939df3ee23b4981f1a8841c7ddd2981c1ef391feb559a5e \ No newline at end of file