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

Merge the sort-and-merge optimization bug fix into the wal2 branch.

FossilOrigin-Name: ec0fb37faa6555d3167cf7793ba7bc2d8ba30726143428b8eafee3b0a6ad83f4
---

4b3af91fbda542955aad1507a22a15e107c6e526
diff --cc manifest
index c14b9d71f0,c825abc294..57adcb4ab4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2026-03-04T11:08:10.322
 -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\sinto\sthe\swal2\sbranch.
++D 2026-03-04T13:24:55.454
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2203,8 -2189,8 +2203,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 4ab288bd4a0b83e988121c6f46ecea0bd19244b62b2c3010ce3f4bf449de6136 7168988acbec2d8d51106a263e553f8942b8b23d983dbbe5028e0f9be68cbb83
- R 9ee5114c99df1e74ea0a831f5bdb20d4
- U dan
- Z ccb71c0e2766033118391073dcd47092
 -P 6ba7797cac7dc873b62a12be5712511c9199b379342dac4a1887bfd65227a298
 -R 7127c439ea41ec62f75cef8391656a07
++P 947411e56c009b8212c406eff187ddf1cace7869ebcb7d12192bdb38f2d6f6c9 61f8a28591a833b1f5834a347feefeba8414fecc7ff154f1b6ef19963f181812
++R 8924eb5934f020887cb79a3867ad5f0e
+ U drh
 -Z 05c4a0745826c227013aa02b8d852b71
++Z 6a6ae871c5b3078cf254732001612d68
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4619b6428a,78bbfcdc32..66f3880fce
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 947411e56c009b8212c406eff187ddf1cace7869ebcb7d12192bdb38f2d6f6c9
 -61f8a28591a833b1f5834a347feefeba8414fecc7ff154f1b6ef19963f181812
++ec0fb37faa6555d3167cf7793ba7bc2d8ba30726143428b8eafee3b0a6ad83f4