Add NEVER() to a branch that check-in [5d54d9fd40638138] apparently made

unreachable.

FossilOrigin-Name: 5c8e6296aa9f69a092364524b716ba894f113f7f1e6024b9a2eaa01c239e65c1

diff --git a/manifest b/manifest
index 72a3bd8f373e458e085da72fcfc074a4a7d4470c..cb5c4da361cef03cebb79e858c2dcae2274a114e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sin\ssqlite3FinishCoding().
-D 2021-02-04T13:44:42.342
+C Add\sNEVER()\sto\sa\sbranch\sthat\scheck-in\s[5d54d9fd40638138]\sapparently\smade\nunreachable.
+D 2021-02-04T13:52:34.346
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -482,7 +482,7 @@ F src/auth.c 8d1df0e2ef8bafbedd4f1fe4baff03eb27507da4bf6e449df3613d383c4018b2
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 4da25694985ac8f5f714bfa58a6cd453f9161d7da9394a95605aaa4db2752757
+F src/btree.c 694020ad8a3af3d79b09f74c8f1421272a419cdea42a13401e3b0f7dea6e9c3e
 F src/btree.h 285f8377aa1353185a32bf455faafa9ff9a0d40d074d60509534d14990c7829e
 F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
 F src/build.c 4a70f3ce393dba6963e7d74f72fab0108da6c87e43f1d8afe3fdb31034e190f6
@@ -1899,7 +1899,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 32f4d04470bf953b08eea285543f16e03de13d5448c1ebccbba1578ca3b5363e
-R cafbcf0e593374a18560abb41780f369
+P 0f34f241d37cc4f31dc657a6fc33815fa5e24298487121cb27c29118524b8ee7
+R cff545e4a39efc504a1ff4bec6444fd1
 U drh
-Z bc6fff01a90b824647bf326788fdbb3d
+Z e8f529c01cdfd85106db62be4d9db740

diff --git a/manifest.uuid b/manifest.uuid
index 0db27cffdf5320cd81ce8e805eb32c2e9798d480..0cefd72434ca9fe803708bdb7c787000244692de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f34f241d37cc4f31dc657a6fc33815fa5e24298487121cb27c29118524b8ee7
\ No newline at end of file
+5c8e6296aa9f69a092364524b716ba894f113f7f1e6024b9a2eaa01c239e65c1
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 0f71b0479e90db9029ed5392da1fabbe0e7e9a8f..d0e51b82dc4236e0aaaac8cf050051403a4960d8 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8014,7 +8014,7 @@ static int balance_nonroot(
     aPgOrder[i] = aPgno[i] = apNew[i]->pgno;
     aPgFlags[i] = apNew[i]->pDbPage->flags;
     for(j=0; j<i; j++){
-      if( aPgno[j]==aPgno[i] ){
+      if( NEVER(aPgno[j]==aPgno[i]) ){
         /* This branch is taken if the set of sibling pages somehow contains
         ** duplicate entries. This can happen if the database is corrupt. 
         ** It would be simpler to detect this as part of the loop below, but