From: drh <drh@noemail.net>
Date: Sun, 10 Nov 2019 10:08:03 +0000 (+0000)
Subject: Remove an incorrect ALWAYS() macro.
X-Git-Tag: version-3.31.0~332
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9576802dbae4501cbec42947ce01286376d2fc10;p=thirdparty%2Fsqlite.git

Remove an incorrect ALWAYS() macro.

FossilOrigin-Name: f7a74f89dbd58b47bbcb58ea2af71fbe1eb5ec2dbe36d90685c39cb28ecf5250
---

diff --git a/manifest b/manifest
index e96c0a1059..b317ba65a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sCOLFLAG_NOTAVAIL\sbitmask\sso\sthat\sit\sfits\sin\sthe\ssingle-byte\nWalker.eCode\sfield.
-D 2019-11-09T15:31:34.029
+C Remove\san\sincorrect\sALWAYS()\smacro.
+D 2019-11-10T10:08:03.079
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c c371a9f3517a4dd6a0b56ebab9588408eddf1eac0277b67b09e030bff99ee1fa
-F src/expr.c 254238a94328ab88b473dcce4b656afd488cb03fced627ad90fb4676c5fe417f
+F src/expr.c a138de8ae79628a73da2597617dbeafb0f083172be81d93ffa1cafa45161ee8c
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1849,7 +1849,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 18c3a17dc8c07b12427e372ff86668d5bcb6b34d653c46c48561ed576acefa5b
-R c9b53d63533ff0e226c2576b2a9fe6e8
+P 53847f5c28bdecfbc7b08685d4dcd0565526f6191491b4827c3c966a4b8d4a85
+R 32ff259c4c31eae195be4b193547ceca
 U drh
-Z 10a116f8fda26704cbc95112c3e19d89
+Z d4f922e0aea15d13aa4d8771cf77d1fd
diff --git a/manifest.uuid b/manifest.uuid
index 9d6fd7c182..589efc1e31 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53847f5c28bdecfbc7b08685d4dcd0565526f6191491b4827c3c966a4b8d4a85
\ No newline at end of file
+f7a74f89dbd58b47bbcb58ea2af71fbe1eb5ec2dbe36d90685c39cb28ecf5250
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 093736f39f..45c053a8c3 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -190,15 +190,12 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){
         Expr *pNext  = p->pRight;
         /* The Expr.x union is never used at the same time as Expr.pRight */
         assert( p->x.pList==0 || p->pRight==0 );
-        /* p->flags holds EP_Collate and p->pLeft->flags does not.  And
-        ** p->x.pSelect cannot.  So if p->x.pLeft exists, it must hold at
-        ** least one EP_Collate. Thus the following two ALWAYS. */
         if( p->x.pList!=0 
          && !db->mallocFailed
          && ALWAYS(!ExprHasProperty(p, EP_xIsSelect))
         ){
           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;