From: drh <>
Date: Sat, 24 Aug 2024 18:42:39 +0000 (+0000)
Subject: Remove a term from an assert() that is no longer relevant.
X-Git-Tag: version-3.47.0~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9eff9052d3574ee275823347d46792ada12f4be;p=thirdparty%2Fsqlite.git

Remove a term from an assert() that is no longer relevant.

FossilOrigin-Name: 8b4766252b80075354a6b1406c5430fe999a6490aa3e079893fcc682d88734f7
---

diff --git a/manifest b/manifest
index d040579c44..064ca3e7dd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sa\sstack\soverflow\sthat\scould\sbe\scaused\sby\sa\srecursively\sdefined\sWINDOW()\swith\sa\sstrategically\sembedded\serror.
-D 2024-08-24T15:54:15.509
+C Remove\sa\sterm\sfrom\san\sassert()\sthat\sis\sno\slonger\srelevant.
+D 2024-08-24T18:42:39.760
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -762,7 +762,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce
 F src/printf.c 6a87534ebfb9e5346011191b1f3a7ebc457f5938c7e4feeea478ecf53f6a41b2
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c fc033f60ce022b1a18d441882965c77042a184d5ea14f8995b6984d38d8bb323
+F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
 F src/shell.c.in 990e77ca805273edd55071c71327d202f1854e19c2e9437c039d91ff3192d7c4
@@ -2210,8 +2210,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b75f8b2252aefe7bb96fa237205a1a9dc88c46d9ec09bca7407e6c636b203e7e
-R 0795580169838cc9e02bb8801025ded0
-U dan
-Z 355e8a98a035830f16c29e0d1fb54ccb
+P bada54bd6bf54190e40aa721b77081015957d204c7b6a9fdbe8c67bcf20798f8
+R 00dd14ae6fd191eb1e24d275e84ccb9b
+U drh
+Z 4d530e51c1fc3bb001032c5e8c4a226a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e2adcf6c6d..803a4f07f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bada54bd6bf54190e40aa721b77081015957d204c7b6a9fdbe8c67bcf20798f8
+8b4766252b80075354a6b1406c5430fe999a6490aa3e079893fcc682d88734f7
diff --git a/src/resolve.c b/src/resolve.c
index 202e87db95..b755cc8646 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1302,7 +1302,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
 #ifndef SQLITE_OMIT_WINDOWFUNC
         if( pWin && pParse->nErr==0 ){
           Select *pSel = pNC->pWinSelect;
-          assert( pWin==0 || (ExprUseYWin(pExpr) && pWin==pExpr->y.pWin) );
+          assert( ExprUseYWin(pExpr) && pWin==pExpr->y.pWin );
           if( IN_RENAME_OBJECT==0 ){
             sqlite3WindowUpdate(pParse, pSel ? pSel->pWinDefn : 0, pWin, pDef);
             if( pParse->db->mallocFailed ) break;