Fix an incorrect answer that might arise if a scalar query is both

DISTINCT and contains an OFFSET clause.
[forum:/forumpost/2025-12-03T09:25:59Z|Forum post 2025-12-03T09:25:59Z].

FossilOrigin-Name: aef5397569d65d2971367b0278fe3a6f42544cf771572e7d046e2472f052364d

diff --cc manifest
index ca6ebf8b7aa5d5071adbe14561273b7c0d5343eb,9e978b448161dd95b9d05865b394032ab1f29bf3..19e8683c370d820b60599f9ee165717fa3811949
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\saggressive\soptimization\sof\sIS\sNULL\sand\sIS\sNOT\sNULL\soperators\sin\nthe\sparser.\s\sNew\ssqlite3ExprInt32()\sinternal\sinterface\sfor\screating\ninteger\snodes\sin\san\sexpression\stree.
- D 2025-12-03T21:31:53.753
 -C Fix\sa\sproblem\sthat\scould\soccur\swhen\sa\sscalar\ssubquery\shad\sboth\sa\sDISTINCT\sand\sOFFSET\sclause.\sFirst\sreported\sby\s[forum:41bd7af485\s|\sforum\spost\s41bd7af485].
 -D 2025-12-03T14:39:25.881
++C Fix\san\sincorrect\sanswer\sthat\smight\sarise\sif\sa\sscalar\squery\sis\sboth\nDISTINCT\sand\scontains\san\sOFFSET\sclause.\n[forum:/forumpost/2025-12-03T09:25:59Z|Forum\spost\s2025-12-03T09:25:59Z].
++D 2025-12-04T00:05:49.341
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -687,7 -687,7 +687,7 @@@ F src/date.c e19e0cfff9a41bfdd884c65575
  F src/dbpage.c c9ea81c11727f27e02874611e92773e68e2a90a875ef2404b084564c235fd91f
  F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
  F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
- F src/expr.c a8f43b1a61b7083a5bba00a70df0aa13cd33e9422a81405135d8d6c9b63bb990
 -F src/expr.c 0f65d201a4f1f3ff1bb49a40af896fd7082a7f28dae138d0b9150d94b0db1e5b
++F src/expr.c b4530f3e23d8ea38c7de4c7b55af52d43156c79128c042a580e670776f59a9bc
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
  F src/func.c 0b802107498048d3dcac0b757720bcb8506507ce02159e213ab8161458eb293b
@@@ -734,9 -734,9 +734,9 @@@ F src/pragma.c ecec75795c1821520266e4f9
  F src/prepare.c f6a6e28a281bd1d1da12f47d370a81af46159b40f73bf7fa0b276b664f9c8b7d
  F src/printf.c b1b29b5e58e1530d5daeee5963d3c318d8ab2d7e38437580e28755753e0c1ded
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 -F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a
 +F src/resolve.c 8d53771eb51a4ab5f970150c3a70969d8db79cd04a8774c2d296bbcf471a0dd0
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c 9d4704ac072fdc86cf1b4184353ee7cca73aae4176bb30bb71c49aeb2901e427
 -F src/select.c e556448217b0d6d42f47cfa79bc9b667a9cb26cedce77cf41f91be2bd535a6ca
++F src/select.c 344518c1bba9c4636bf651b7642304abd2e7075ba35feb4bae42a51e5efe991f
  F src/shell.c.in 62b286951404fd72c116bb3b96b5ee9330de4dc4c8753ca33967ca1a47b3b972
  F src/sqlite.h.in 706cacea5308b0244fb6cec92e08310fb427a125375c64137cc1f878ae4cf5c0
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
@@@ -2183,9 -2183,11 +2183,9 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P afe5ee64f1cde4945c878220b029f2a22578c2bccda4fddc005c4e6a4718c6cd c69eec9909af40e1e22d44a6859ef52378ebe06a587373f332f9d379cb39a84d
- R e345b725a39db244a730c4ef212bf292
- T +closed c69eec9909af40e1e22d44a6859ef52378ebe06a587373f332f9d379cb39a84d
 -P afe5ee64f1cde4945c878220b029f2a22578c2bccda4fddc005c4e6a4718c6cd
 -R 047e6324568940b4556b75113b868f2a
 -T *branch * distinct-offset-subquery-fix
 -T *sym-distinct-offset-subquery-fix *
 -T -sym-trunk *
 -U dan
 -Z 769c0bdc01c64bb06852dc79c8e1f0eb
++P 560082d61f5b73ae68a86ce4d7e96d072d4f0996d82ec62d639847353bb8bf15 496bbff910b73775b16c1ccb95dadf37416d3f3032722a1140f2a9134666d7f1
++R f21a86d3146104bf72ac01ccd6b4f8b6
++T +closed 496bbff910b73775b16c1ccb95dadf37416d3f3032722a1140f2a9134666d7f1
 +U drh
- Z 25e7954f74fccfd8d096164eadd24bf3
++Z 23e97f8b5553d5cafcf6705d7f74e35b
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index bf317a30e78124c274cdb1638d289bd116be5147,dfe56a33cb2ff7ab5d5795fccccb2fea804a6b06..5d9c871883d47e574c371f552eb95dee5a9fbbb3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 560082d61f5b73ae68a86ce4d7e96d072d4f0996d82ec62d639847353bb8bf15
 -496bbff910b73775b16c1ccb95dadf37416d3f3032722a1140f2a9134666d7f1
++aef5397569d65d2971367b0278fe3a6f42544cf771572e7d046e2472f052364d

diff --cc src/expr.c
Simple merge

diff --cc src/select.c
Simple merge