Remove a "harmless()" macro that is no longer relevant.

FossilOrigin-Name: 87c357c60168fdc52c82382aa7288d66886f5fbe2ae6af68344dbcfdbca9069b

diff --git a/manifest b/manifest
index 704d5dd7de46d6050db75f2199d75f88d374c117..fe9a7746624db9522fd7d48860441905bb5819d6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\s"PRAGMA\swritable_schema=RESET".
-D 2021-10-08T16:39:33.643
+C Remove\sa\s"harmless()"\smacro\sthat\sis\sno\slonger\srelevant.
+D 2021-10-08T18:12:37.220
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -490,7 +490,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 8ec2758e13d8a3884b3eb197f6aa59857ffd57943eaf18e8b961d19ad81f6266
+F src/btree.c 7c07979ab50dc15e0c3f967897543ce09743b1d11377f10f9dd4a2fd0ec3e0e4
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c 46df621d2426fe04494ad83d86d2edb5f79f6a14a4595981e4de2502f172794e
@@ -1928,7 +1928,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 c7fae46c8a3bd78adc5a01340eff6c1efa75f9384dc7f42cb81717b029e7c56f
-R c222db3e9e08c849b67cafc40e6de8c1
+P a51b305bd068f8d8e85b9fc38d61cdf5957f3a2ad2eb2e77015547910088e681
+R fd484d3c128a2ea8cf0418a51903c533
 U drh
-Z dd0d8cab0621c5c115ac8ea1cce302b4
+Z 279abe732b42272c57b1f99ac8bf0794

diff --git a/manifest.uuid b/manifest.uuid
index c6f8a8a75f782dd7ca458f4e05b4f39c688e909e..c74aa093d422cd15c0b805066b0b8c6bd69d357f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a51b305bd068f8d8e85b9fc38d61cdf5957f3a2ad2eb2e77015547910088e681
\ No newline at end of file
+87c357c60168fdc52c82382aa7288d66886f5fbe2ae6af68344dbcfdbca9069b
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 9c22c703538c2c37c08bcd17a8f54d0140f5c9ab..f5d99967494c701772db36d344f506a9a1f9f232 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5871,16 +5871,6 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
     return SQLITE_CORRUPT_BKPT;
   }
 
-  /* If the database file is corrupt, it is possible for the value of idx 
-  ** to be invalid here. This can only occur if a second cursor modifies
-  ** the page while cursor pCur is holding a reference to it. Which can
-  ** only happen if the database is corrupt in such a way as to link the
-  ** page into more than one b-tree structure.
-  **
-  ** Update 2019-12-23: appears to long longer be possible after the
-  ** addition of anotherValidCursor() condition on balance_deeper().  */
-  harmless( idx>pPage->nCell );
-
   if( idx>=pPage->nCell ){
     if( !pPage->leaf ){
       rc = moveToChild(pCur, get4byte(&pPage->aData[pPage->hdrOffset+8]));