From: drh <>
Date: Sat, 10 Jun 2023 17:15:59 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the newbie-safe-aggregates branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ff7a1da5f58758fb426ef83d9ceef090429b5b0;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the newbie-safe-aggregates branch.

FossilOrigin-Name: e19e20fbaf6dedc5bf062120f3440eda86befb72a080d3ed70dbc45329ddf06d
---

0ff7a1da5f58758fb426ef83d9ceef090429b5b0
diff --cc manifest
index ee87410939,72c7eecaf5..29696c13d6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\spotential\sUAF\sin\sthe\sparser\scaused\sby\sthe\schanges\son\sthis\sbranch.
- D 2023-06-10T09:24:29.722
 -C Extra\sspace\sto\sprevent\sa\sbuffer\soverread\son\scorrupt\sSTAT4\srecords.\ndbsqlfuzz\s7128d1b41ce9df2c007f9c24c1e89e2f1b2590ca.
 -D 2023-06-10T17:05:05.973
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\snewbie-safe-aggregates\sbranch.
++D 2023-06-10T17:15:59.781
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2040,8 -2040,8 +2040,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0b0172087954d62fec532afce4532beb6a3882736e089bdd46aa5954bca2dbcd
- R 8d8f51f057e655134315380759665ca2
 -P 918708c6dea5bffab4bb1c15d655ac7356bae97b84def905479dfcf491db6c5f
 -R 66b1961aee52684a421f5e6d2ab92f25
++P c29ec76944e2ee62e3f3383047a92c05e97f59387874985381e74a47ffe69d28 b99135288b157044e2319833e8632c89483778f876aa45ee66e46ffb6ae42ab2
++R a9af6d8215c878aa8b271d2abee7bad7
  U drh
- Z fd58e797b8cc173f8b54b4a0f1bd74a8
 -Z 45b50f5159d3508cc396ca14de4bdb0e
++Z 5768a19ec2fc1689ab2c8105d751d176
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 93e5887727,2f551f6fae..b5a4fd4a2f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c29ec76944e2ee62e3f3383047a92c05e97f59387874985381e74a47ffe69d28
 -b99135288b157044e2319833e8632c89483778f876aa45ee66e46ffb6ae42ab2
++e19e20fbaf6dedc5bf062120f3440eda86befb72a080d3ed70dbc45329ddf06d