From: drh <> Date: Mon, 7 Nov 2022 15:23:51 +0000 (+0000) Subject: Fix an obsolete comment. X-Git-Tag: version-3.40.0~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54422235e9f072409698a11873acde4cfdf4743a;p=thirdparty%2Fsqlite.git Fix an obsolete comment. FossilOrigin-Name: e377c0a1ef030395293c5f24d7cb8e5b36ce972e9fac31b99c8425075486a46a --- diff --git a/manifest b/manifest index 7d5d1ad65e..ae4b203803 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stypo\sin\scomment. -D 2022-11-07T15:01:05.980 +C Fix\san\sobsolete\scomment. +D 2022-11-07T15:23:51.075 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -636,7 +636,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c 12cb5162e606290354f9512ff0c30fc6dc4d7a77a92b6c5b581395f9c4edd047 +F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 F src/shell.c.in 84bb08d8762920285f08f1c0993f1b3992ac43af5d72445cb8a973fc50c71923 F src/sqlite.h.in 46052b3bcab8d34387bbe9ae4f49da9c2e05f19188bbd15a1c05abd895b56b23 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -2054,8 +2054,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 cea8bf9a144d842c4755c3130273524926e8c4831d7f21c4e34d4e8c74109c8c -R 832a383168fc2e8a0fdf3800c81c0506 +P c3b94d7d4697a5c3983253f6266c544d8037617778a09d491bc12eb13f08ac75 +R dd4978287b5cf609d382d6cbd8393f07 U drh -Z 4c23a15de02032ecc5a56e47dc98929f +Z 53b9d7bd5407d202e6402a998a55a00f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fb284922df..8925f56312 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c3b94d7d4697a5c3983253f6266c544d8037617778a09d491bc12eb13f08ac75 \ No newline at end of file +e377c0a1ef030395293c5f24d7cb8e5b36ce972e9fac31b99c8425075486a46a \ No newline at end of file diff --git a/src/select.c b/src/select.c index 602a9d7df4..b0f79f840b 100644 --- a/src/select.c +++ b/src/select.c @@ -3693,8 +3693,8 @@ static int multiSelectOrderBy( */ sqlite3VdbeResolveLabel(v, labelEnd); - /* Reassemble the compound query so that it will be freed correctly - ** by the calling function */ + /* Make arrangements to free the 2nd and subsequent arms of the compound + ** after the parse has finished */ if( pSplit->pPrior ){ sqlite3ParserAddCleanup(pParse, (void(*)(sqlite3*,void*))sqlite3SelectDelete, pSplit->pPrior);