Remove a redundant branch added by [56a54258560].

FossilOrigin-Name: b4d6f6d728738710249ad74236c31a1872fdff7dadabd4c4a67d05826eb5df9e

diff --git a/manifest b/manifest
index 2b7531deb8e781761c84fc76c0ea03f9fa1371b8..a3131d8cd4e3b08812310e24c5d6968e7829f026 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\savoid\sloading\slarge\srecords\sinto\smemory\swithin\sVACUUM.
-D 2020-12-10T19:51:39.987
+C Remove\sa\sredundant\sbranch\sadded\sby\s[56a54258560].
+D 2020-12-10T19:54:13.413
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,7 +481,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c de8d2a4d8dedf9187cc9019b8f882bc788ab8fe815b7f69042e880fbc11304dc
+F src/btree.c 91da5fd5d99bc7e7422242419561bd9518e0229c243c48799303be7112ef5601
 F src/btree.h 285f8377aa1353185a32bf455faafa9ff9a0d40d074d60509534d14990c7829e
 F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
 F src/build.c f6449d4e85e998e14d3f537e8ea898dca2fcb83c277db3e60945af9b9177db81
@@ -1889,8 +1889,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 01841fb4bf3d6c5fd5bcbc7d1338998c50f69f84ca475fba7cf764d636714678 f7fa76d0963e7b34026dc20c920bfbf7961033fe2b99503f6857157595f86823
-R 4dec8f74318b8721d36ac1bd02f7a778
-T +closed f7fa76d0963e7b34026dc20c920bfbf7961033fe2b99503f6857157595f86823
+P 56a54258560fab715b83967634b2bd4c04be43cded112b46e85da9f99ee02f7c
+R c82b011ba062cfde3acc0789a727fd1f
 U dan
-Z 3adf74c0105eb40ca1b5c5d7fdb48232
+Z 9746b01cc9973ffd448104549b3bbdff

diff --git a/manifest.uuid b/manifest.uuid
index c98df885d4ab7d3a8dcdfb36e554c7c65ce7ede9..8a864002eedf3a1a5aaa9bff7428f081ef21fb1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56a54258560fab715b83967634b2bd4c04be43cded112b46e85da9f99ee02f7c
\ No newline at end of file
+b4d6f6d728738710249ad74236c31a1872fdff7dadabd4c4a67d05826eb5df9e
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 7522f01c36b976b650267afd336138b15110b172..3ed365c5f744c3a4fe4c4337bf041b637033b8ee 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8831,7 +8831,7 @@ int sqlite3BtreeInsert(
     if( ISAUTOVACUUM && szNew>pPage->maxLocal ){
       CellInfo info;
       pPage->xParseCell(pPage, newCell, &info);
-      if( ISAUTOVACUUM && info.nPayload!=info.nLocal ){
+      if( info.nPayload!=info.nLocal ){
         Pgno ovfl = get4byte(&newCell[szNew-4]);
         ptrmapPut(pBt, ovfl, PTRMAP_OVERFLOW1, pPage->pgno, &rc);
       }