Back out a couple of ALWAYS() macros from [4fab9089868bbb05]. Test case

added to TH3.

FossilOrigin-Name: d26963a530ccbe36a174823d2f0bd7e06c6fca4f38ecdd04cd700c4000cc3719

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index fb11851073217cf51bbc2c2292ba38201c40b527..9882e729884604090ad0a65290ef51c63adcf908 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -2742,14 +2742,14 @@ static int removeNode(Rtree *pRtree, RtreeNode *pNode, int iHeight){
 
   /* Remove the entry in the parent cell. */
   rc = nodeParentIndex(pRtree, pNode, &iCell);
-  if( ALWAYS(rc==SQLITE_OK) ){
+  if( rc==SQLITE_OK ){
     pParent = pNode->pParent;
     pNode->pParent = 0;
     rc = deleteCell(pRtree, pParent, iCell, iHeight+1);
     assert( rc==SQLITE_OK );
   }
   rc2 = nodeRelease(pRtree, pParent);
-  if( ALWAYS(rc==SQLITE_OK) ){
+  if( rc==SQLITE_OK ){
     rc = rc2;
   }
   if( rc!=SQLITE_OK ){

diff --git a/manifest b/manifest
index e9bd941a6a05cbed68a9b81ea7fd94692fa1789d..cc80ea1a86922c367c3cadafcf11be7d913401a6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sALTER\sTABLE\sRENAME\sCOLUMN,\sdo\snot\stry\sto\sfilter\svirtual\stables\sout\sof\ncalls\sto\ssqlite_rename_column().\s\sLet\sthe\sfunction\sfilter\sthem\sitself.\nThe\sWHERE\sclause\scan\smistakenly\slet\svirtual\stables\sthrough\sif\sthe\nsqlite_schema\stable\sis\scorrupt.\s\sThe\ssqlite_rename_column()\sfunction\smust\ndeal\swith\sthem.\s\sWe\smight\sas\swell\slet\sit\sdeal\swith\sthem\salways.
-D 2021-09-16T13:20:29.202
+C Back\sout\sa\scouple\sof\sALWAYS()\smacros\sfrom\s[4fab9089868bbb05].\s\sTest\scase\nadded\sto\sTH3.
+D 2021-09-16T13:52:28.954
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -393,7 +393,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c 98d45533989e908bf65b43f36ff6eaad95a9ffe6f3b6b8658fbd47d45c58b10b
-F ext/rtree/rtree.c 2b1b062db00ffe1c23b02a41bd87a41e7fa48045b117d1a018086bdff4307012
+F ext/rtree/rtree.c 0b29e4c22dc77624e6a34ad7bc2f4a87134c9f969181c8e810730eff3d6ecfcb
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -1923,7 +1923,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 7e3d6810039ca4563aa68dfa3671f570792a10f75c8eea68aa7dfd02d17702ca
-R 378205b2666eaba7b023c1032e333fa8
+P 7c82b43b7cdb825f431d3a778f8b34e32666ccb3b067f1f2533d3b3dcca7bdc9
+R bd2ea363c50ccc047d220f195374da1e
 U drh
-Z 5124dd372b8dc8ce068a8819461c7507
+Z 3d12fcb6b240ab06f67671311946d4f3

diff --git a/manifest.uuid b/manifest.uuid
index 229bc514207f78982d99f28d648464edcbf06b53..9f6a2edd6bbdb14b7731a288e61a9c5c55cf567e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c82b43b7cdb825f431d3a778f8b34e32666ccb3b067f1f2533d3b3dcca7bdc9
\ No newline at end of file
+d26963a530ccbe36a174823d2f0bd7e06c6fca4f38ecdd04cd700c4000cc3719
\ No newline at end of file