Remove an ALWAYS() that might now be false due to the prior check-in.

FossilOrigin-Name: fc68993501aaa7180f5457dcb3c296e5b199904a385d98e2bcad7854e34d428e

diff --git a/manifest b/manifest
index 08dc7efb09f03f92d8f0ff539e87f9d540ca00a3..8c4aa0ad86413cdb29585efad329dbcf8c546b30 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sfunction\sthat\sdetermines\sthe\scollating\sfunction\sfor\san\sexpression\ntree\sto\shandle\snew\scases\sthat\sarise\sas\sa\sresult\sof\sthe\srecently\sadded\nability\sto\suse\sindexed\sexpressions\sin\saggregate\squeries.\n[forum/forumpost/0713a16a44|Forum\spost\s0713a16a44].
-D 2023-04-05T02:21:57.915
+C Remove\san\sALWAYS()\sthat\smight\snow\sbe\sfalse\sdue\sto\sthe\sprior\scheck-in.
+D 2023-04-05T02:50:00.410
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -575,7 +575,7 @@ F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c f3eea5f7ec47e09ee7da40f42b25092ecbe961fc59566b8e5f705f34335b2387
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
-F src/expr.c 60b2e406df2d3ebd05302659b0f1354026f1145477428436ef3ae9ce98957908
+F src/expr.c 1c17d1ff2e5924178b82355d192b4927030b3c39317feff5633aecec8f77d0fe
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
@@ -2052,8 +2052,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5b980d72a03fa1cfd0f1bf3ed04068b9f216b75a304deb2b7bbe8ddce0e6fb96
-R 7c7fc015455f5e833e4cdc87fb91e9e2
+P cc5041f3f067cf610adffb868b4e2d1b5d248dc5a0ecc551339b670800ecb0ff
+R 13f76b464bbf0db7eee4f47f89c8f40d
 U drh
-Z ea122c35df9ab34c8929b37c7d61629c
+Z c4aa246b09ce02d9717280a76242d5a6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ed4439c27589ff16f348210d53d6e75b607dfeee..e4e229337fd3036b87fd14c2cc885b56ec01a7d8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cc5041f3f067cf610adffb868b4e2d1b5d248dc5a0ecc551339b670800ecb0ff
\ No newline at end of file
+fc68993501aaa7180f5457dcb3c296e5b199904a385d98e2bcad7854e34d428e
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index f1ce6ba4a26a942986e662367d1527c8578bbd8c..3dccb3bacbfc338a419da6aa7e1aae1322b02a72 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -281,7 +281,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
         assert( !ExprUseXList(p) || p->x.pList==0 || p->pRight==0 );
         if( ExprUseXList(p) && p->x.pList!=0 && !db->mallocFailed ){
           int i;
-          for(i=0; ALWAYS(i<p->x.pList->nExpr); i++){
+          for(i=0; i<p->x.pList->nExpr; i++){
             if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){
               pNext = p->x.pList->a[i].pExpr;
               break;