From: drh <> Date: Wed, 18 Oct 2023 19:07:45 +0000 (+0000) Subject: Fix one minor error in order to get all legacy tests to pass. X-Git-Tag: version-3.44.0~91^2~6 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0021079ceb4f0583ae66d66bac510cb1644ff149;p=thirdparty%2Fsqlite.git Fix one minor error in order to get all legacy tests to pass. FossilOrigin-Name: 5a885139c433a143302ab43dc5aaac1fed9db61548b4ff7d4b19b3a6a46c8fcc --- diff --git a/manifest b/manifest index 24129053b0..7bfe811a5d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C ORDER\sBY\son\saggregates\sseem\sto\swork,\sat\sleast\sfor\ssimple\ssmoke\stests.\s\sLots\nmore\stesting\sis\sneeded\sthough.\s\sSurely\sthere\sare\smany\sbugs. -D 2023-10-18T18:11:11.181 +C Fix\sone\sminor\serror\sin\sorder\sto\sget\sall\slegacy\stests\sto\spass. +D 2023-10-18T19:07:45.183 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -718,7 +718,7 @@ F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c ee4011c8ed177de113e617e514f66ec5c38772cf2f00efa33f9576cbf076361c F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c dd0f0ed89668f298e12226127ac4d977a696475a4b6572218c14511022001d42 +F src/select.c 80c5c95fcd5d9354884d825ca3f00cc20655484679cb9c995a2bb4f5d5b84a7b F src/shell.c.in cf0a3387c5bb05ca2fe6073fa7df21aaa11e749ca5b3846b80b586a447e728aa F src/sqlite.h.in 60e5698417e674f44be17d5ceeb4c2d395ccedba18d6de05435dec0135d9eff1 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -2133,8 +2133,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 c83a53a574d312130d1238c05ffa449d8bed2535d5ef5b5d9cf02f894494cca4 -R c20d0fa6dc56e340bbaa31e8a36615e8 +P 64c12a835b6f1df8f2f5f4a41de083f6b3fc7f8030042c6aac0082382cd9cc4d +R d6ccbf7622f816d9126033156316cd20 U drh -Z 66c7548e2f839878f6f4ddcf4735c183 +Z d5004cc6bd28c98dd137858c93e3d27b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 312ea1e8ab..ce4e3fb168 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -64c12a835b6f1df8f2f5f4a41de083f6b3fc7f8030042c6aac0082382cd9cc4d \ No newline at end of file +5a885139c433a143302ab43dc5aaac1fed9db61548b4ff7d4b19b3a6a46c8fcc \ No newline at end of file diff --git a/src/select.c b/src/select.c index 36b6e0dd7b..60583b20a3 100644 --- a/src/select.c +++ b/src/select.c @@ -6687,7 +6687,7 @@ static void finalizeAggFunctions(Parse *pParse, AggInfo *pAggInfo){ ExprList *pList; assert( ExprUseXList(pF->pFExpr) ); pList = pF->pFExpr->x.pList; - if( pF->iOBTab ){ + if( pF->iOBTab>=0 ){ /* For an ORDER BY aggregate, calls to OP_AggStep where deferred and ** all content was stored in emphermal table pF->iOBTab. Extract that ** content now (in ORDER BY order) and make all calls to OP_AggStep