From: drh <>
Date: Wed, 4 Mar 2026 13:15:58 +0000 (+0000)
Subject: Merge the sort-and-merge optimization bug fix from trunk.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb839cf1a1f7957088547d779b033e3ff6116d02;p=thirdparty%2Fsqlite.git

Merge the sort-and-merge optimization bug fix from trunk.

FossilOrigin-Name: 4ffe1208c9c9c2686123896bb67b5edc20d10b0b9709540273004d68a00c3f44
---

fb839cf1a1f7957088547d779b033e3ff6116d02
diff --cc manifest
index 2126c4bd31,c825abc294..5fff90b6b7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
- D 2026-03-03T23:01:51.385
 -C Remove\sdead\s(commented-out)\scode\sthat\scame\sto\smy\sattention\sbecause\sit\nws\snearby\sthe\sfix\sof\sthe\sprevious\scheck-in.
 -D 2026-03-04T13:08:14.899
++C Merge\sthe\ssort-and-merge\soptimization\sbug\sfix\sfrom\strunk.
++D 2026-03-04T13:15:58.575
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -731,15 -726,15 +731,15 @@@ F src/pcache1.c 131ca0daf4e66b4608d2945
  F src/pragma.c ecec75795c1821520266e4f93fa8840cce48979af532db06f085e36a7813860f
  F src/prepare.c f6a6e28a281bd1d1da12f47d370a81af46159b40f73bf7fa0b276b664f9c8b7d
  F src/printf.c 9cff219dba73b1aa9a8113e83e962f03f7bea8b6eb51cefb25bc468d5a69fb2d
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 +F src/random.c a3e70f8515721ff24d2c0e6afd83923e8faab5ab79ececea4c1bf9fe4049fbb2
  F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c 08a53faa557429a4d82246e2b133416872732d75a980d7f359206b35c5749258
 -F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
++F src/select.c 5c5b5bd015202400779d4b5dcfe96ed15b7312e169ed549182f74c25ac9e4207
  F src/shell.c.in 2acdfca982deb70cdfefb8b422822d4e0234fe4dde6ff2bd9020b26445853917
 -F src/sqlite.h.in 1f853f1d836af3e5a0b451521041d05658988a45f6978aaae08286e483fee5ac
 +F src/sqlite.h.in 07c7014bab38d18c068752d55b40d3242906d25707ba2245efb67519146cee41
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
 -F src/sqliteInt.h 185abb373dc2a311e3292540ef177ea301d8140b976ecd8ba381a5a0162cd6e9
 +F src/sqliteInt.h c16b978715d55362508b19dc8e65541e7131eb26999297d35732c290d8da71e6
  F src/sqliteLimit.h 904a3f520362c7065c18165aaabd504fb13cc1b76cb411f38bd41ac219e4af1e
  F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2206,8 -2189,8 +2206,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 8c043820d33c19ed8621e26de70655d1bc4c13103427a36f056f439a7fbb98b3 7168988acbec2d8d51106a263e553f8942b8b23d983dbbe5028e0f9be68cbb83
- R 2984847c7bd8afd18c47d58480f4143f
 -P 6ba7797cac7dc873b62a12be5712511c9199b379342dac4a1887bfd65227a298
 -R 7127c439ea41ec62f75cef8391656a07
++P 81bde19bb9bb0be9eddb5c4c564a1a6ee3f612b41ff5289466f09ae1d62e9206 61f8a28591a833b1f5834a347feefeba8414fecc7ff154f1b6ef19963f181812
++R 5b0c0ab38c1e1448d3af02e16b3f33e6
  U drh
- Z f223610a88ab3c9bce4a1c082284d6e3
 -Z 05c4a0745826c227013aa02b8d852b71
++Z 6e604c65f11f5da7dccc8fd317126c96
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index ab4f7f9d23,78bbfcdc32..2782b70f0e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 81bde19bb9bb0be9eddb5c4c564a1a6ee3f612b41ff5289466f09ae1d62e9206
 -61f8a28591a833b1f5834a347feefeba8414fecc7ff154f1b6ef19963f181812
++4ffe1208c9c9c2686123896bb67b5edc20d10b0b9709540273004d68a00c3f44