From: drh <>
Date: Fri, 3 Nov 2023 11:35:33 +0000 (+0000)
Subject: Merge all the latest trunk fixes and enhancements into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24f7f5923d9f630339a17afba82060f946d3bbae;p=thirdparty%2Fsqlite.git

Merge all the latest trunk fixes and enhancements into the jsonb branch.

FossilOrigin-Name: b089bf46374b374d02d7654c65eb3e75d1777638b398061e47644af0dab48c9b
---

24f7f5923d9f630339a17afba82060f946d3bbae
diff --cc manifest
index a1f4d26271,030821495e..869a09d63f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Bring\sthe\sjsonb\sbranch\sup-to-date\swith\sversion\s3.44.0\schanges.
- D 2023-11-01T14:12:07.551
 -C Update\sthe\sversion\snumber\sto\s3.45.0\sto\sbegin\sthe\snext\sdevelopment\scycle.
 -D 2023-11-03T10:15:16.434
++C Merge\sall\sthe\slatest\strunk\sfixes\sand\senhancements\sinto\sthe\sjsonb\sbranch.
++D 2023-11-03T11:35:33.434
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -791,10 -793,10 +793,10 @@@ F src/upsert.c fa125a8d3410ce9a97b02cb5
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c 14479441337135eed8e290fb1d4abb7db657d93217a3b1ea8a2f031d3895536a
 +F src/vdbe.c 4c76111311e06e74d2519f9cfee5caaaee722bf04559e16f4758a18a0c723b6c
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
- F src/vdbeapi.c 1cb879087bb33db50e524c7c9385ca8f330384136a2880b0c15e39b2ac4b520f
 -F src/vdbeapi.c db190d007bdf5b9165edeb12369f4c59a459f88fd652c1671c1238862e662cc3
++F src/vdbeapi.c 22a2661a2886f6b142fce91e95533a1841135e8217f65297d7df353a0eddf650
  F src/vdbeaux.c dffcf79e7e415fcd6e4c8ac1ec7124cae5257018443adf09551c807655b04993
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c c936e9002af4993b84c4eb7133d6b1190efe46d391cc86117ecd67ba17b1a04b
@@@ -2140,8 -2141,8 +2142,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 f47a8d0a207a8442a7f621b070ce9dd1d6013ce26bcf68165d20bb379bd478a0 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301
- R 0b642bb03e1bb73ba395a556a197e4e8
 -P 268b5984a4263bee245a9bb47ac927bde56cdf4af8795b851dada5622224076f
 -R dd1ef45ff2a5ccfd075e4867f283d51c
++P a420a4f7ff76b0e9cf5f6d515ccfa31e526d58f4001a4015a367e2aa3c82091f 15b618e92a2708cc83256947736de8c494a9985a77e38bd5efc7e51e72cba344
++R 7bce1ab3b73fc9ca8b3b94f2470fc2d6
  U drh
- Z 3c39b7a06f36c21b3f7d5adacbf5ab4c
 -Z b80b47952b8aa2091fd6d596beedfe43
++Z 13124fe09b7592eb801d594e79ae949a
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 53fcd27c8e,c98a1f3b06..71f504a420
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a420a4f7ff76b0e9cf5f6d515ccfa31e526d58f4001a4015a367e2aa3c82091f
 -15b618e92a2708cc83256947736de8c494a9985a77e38bd5efc7e51e72cba344
++b089bf46374b374d02d7654c65eb3e75d1777638b398061e47644af0dab48c9b