From: drh Date: Mon, 11 Feb 2019 12:51:39 +0000 (+0000) Subject: Updates to a comment to keep it in alignment to the changes on this branch. X-Git-Tag: version-3.28.0~188^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c01f41cfa63e413767101a0e71f54f888e446ab4;p=thirdparty%2Fsqlite.git Updates to a comment to keep it in alignment to the changes on this branch. FossilOrigin-Name: 7499f74351415e601eb48eff6b6fccd3a78d137f5ea9cd7cac46b904772966de --- diff --git a/manifest b/manifest index 194a8307a0..e02fc96147 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\spage-cache\sreference\sleak\sin\sthe\sbtree\sbalancer\swhen\sthere\sis\sa\scorrupt\ndatabase. -D 2019-02-09T22:33:44.636 +C Updates\sto\sa\scomment\sto\skeep\sit\sin\salignment\sto\sthe\schanges\son\sthis\sbranch. +D 2019-02-11T12:51:39.303 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4 @@ -455,7 +455,7 @@ F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 -F src/btree.c 0c9455de1fea43ac2d1384383ae0034c59a9b2a60f12b7eeb934ba27abc91f2b +F src/btree.c 85d49318710ff322811c6f0664cecab1c9d6646175d34878e8b299e9d169a474 F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3 F src/btreeInt.h d7520b98e72f9a7e2a3140cc476df461fa8a34a3d56258184f8c26f70248cef9 F src/build.c 906ca6663b9dcd413e72ae9c44dd51e596d8336b04d52e678a7501e71c20cab2 @@ -1804,7 +1804,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 1d43ee4000b71f5c6d49244dee96358c567f09ba3451b9d22895a796d3f61ad6 -R b28deed0efae0448ead27e80a7ddacc4 +P 9285899120dec24ff2944431ad455d7ae217ef408ae2f1a3e7bdfb897099028c +R 53dbac70400c0535df6c7379dea2a735 U drh -Z 26932f3ade712321f925e8e95108ce1e +Z 0c6f69e2cd78e095467b69c3a20fd016 diff --git a/manifest.uuid b/manifest.uuid index a414673e10..603606eaa8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9285899120dec24ff2944431ad455d7ae217ef408ae2f1a3e7bdfb897099028c \ No newline at end of file +7499f74351415e601eb48eff6b6fccd3a78d137f5ea9cd7cac46b904772966de \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 1085bcc725..d3805823ad 100644 --- a/src/btree.c +++ b/src/btree.c @@ -1433,8 +1433,8 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){ if( (int)data[hdr+7]<=nMaxFrag ){ int iFree = get2byte(&data[hdr+1]); - /* If the initial freeblock offset were out of bounds, that would - ** have been detected by btreeInitPage() when it was computing the + /* If the initial freeblock offset were out of bounds, that would have + ** been detected by btreeComputeFreeSpace() when it was computing the ** number of free bytes on the page. */ assert( iFree<=usableSize-4 ); if( iFree ){