From: drh <>
Date: Thu, 5 Oct 2023 11:22:16 +0000 (+0000)
Subject: Merge trunk enhancements into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f921e2bac679f560049e4d3d660710a42671f5f;p=thirdparty%2Fsqlite.git

Merge trunk enhancements into the jsonb branch.

FossilOrigin-Name: be5907b648386e05530d1e321e2a3e563e07e99f08373aaf9a3452adc9228dc3
---

0f921e2bac679f560049e4d3d660710a42671f5f
diff --cc manifest
index 3991c75517,a58b92ef8a..6d4d77ef56
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\smemory\sleak\sin\sJSON\sgroup-aggregates\swhen\sthe\soutput\sis\sJSONB.
- D 2023-10-03T22:40:22.299
 -C Improved\sdetection\sof\scorrupt\sdatabases\sin\sbalance_nonroot().\ndbsqlfuzz\sd1cf013c50a620b68c2a5bd240d29afd65e5f58e.
 -D 2023-10-05T11:06:10.790
++C Merge\strunk\senhancements\sinto\sthe\sjsonb\sbranch.
++D 2023-10-05T11:22:16.707
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2123,8 -2123,8 +2124,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 dca684da0c29ec78460362f972ea7747be42c13c4d1325da9d62c1ea58022e39
- R 29d5fdb97c89ceaf3767b5ff5eb276bd
 -P 325bcdea4a436e514d83095d3893caf07a714b718e1b643507179b101c108e3b
 -R 30f43ae2972b7eeb2a422e3f17ecbd1a
++P 08e7db138b636890cb29a76d65c2069c6e2ff44470fa4bca14f4526fe5f195ae a2464bbb825b5976ef974a2e6c17ea150f5e6fcd0dd0f144b9f9c1c22a9c9c82
++R 84b74e4fd51ca93386cc67654677da5e
  U drh
- Z 573dbd4dc43601643579851c7ec5201b
 -Z f02a428d25ebde125df5f15b29c884ab
++Z 4d31c96be6e146821c899c0f24a5a9d8
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index bdc5d99e2d,80b839fb4c..973ac14362
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 08e7db138b636890cb29a76d65c2069c6e2ff44470fa4bca14f4526fe5f195ae
 -a2464bbb825b5976ef974a2e6c17ea150f5e6fcd0dd0f144b9f9c1c22a9c9c82
++be5907b648386e05530d1e321e2a3e563e07e99f08373aaf9a3452adc9228dc3