From: drh <>
Date: Thu, 28 Sep 2023 17:41:45 +0000 (+0000)
Subject: Merge trunk changes into the jsonb branch for the compiler warning fixes
X-Git-Tag: version-3.45.0~116^2~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edbc44c5a165a3ddd47460eb462af685b8917fe3;p=thirdparty%2Fsqlite.git

Merge trunk changes into the jsonb branch for the compiler warning fixes
from two days ago.

FossilOrigin-Name: cee113cc315b04fd75ccc172cf4529bf15b2050bf274433496c31a282e281ab8
---

edbc44c5a165a3ddd47460eb462af685b8917fe3
diff --cc manifest
index fa7bdd2dea,4e5b94b7e4..9246cdfdde
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C The\sjson_extract()\sfunction\snow\sworks\son\sBLOBs\swithout\sthe\sneed\sto\stranslate\ninto\san\sarray\sof\sJsonNode\sobjects.\s\sThis\sis\smuch\sfaster.
- D 2023-09-28T17:27:24.472
 -C Clarify\sserialization\sAPI\sdoc\sw.r.t.\sbuffer\svalidity\sand\susage,\sinstigated\sby\s[forum:/forumpost/8922e2ad2ad41205|forum\spost\s8922e2ad2ad41205].\sNo\scode\schanges.
 -D 2023-09-28T15:00:25.435
++C Merge\strunk\schanges\sinto\sthe\sjsonb\sbranch\sfor\sthe\scompiler\swarning\sfixes\nfrom\stwo\sdays\sago.
++D 2023-09-28T17:41:45.378
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2123,9 -2122,8 +2123,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 7c1be8e361db87458ac9d8fcee080c2b558936539c852bb80f0f7941d61bf15d 3de58ec99444b16dfcda1e226420e2343450b77abd3faf33a88b6d18339ef17c
- R 0d79abb184ac0c9db2e32b0ee612448c
- T +closed 3de58ec99444b16dfcda1e226420e2343450b77abd3faf33a88b6d18339ef17c
 -P 5a39a02d2dfd9ed6171cd0bd434b2bc268d0ed8ead6e1a396d1603266d9493ef
 -R 414329bf52df990dae021d41224235ff
 -U larrybr
 -Z 0d5cdadb62efac32ee8f7d7af101cd86
++P 5853065b7ee326c04ddfcde64c178f487af04cd3adc3cc99f559907484ec169d b488b9fb71652eca90d2bf73d32f3d748badf517859dc833c58e021b0e017194
++R 9fc8b28e091a22aa2df6890c9cd30c84
 +U drh
- Z a7c854fb2b4ed7c43dc9a96e56772dd9
++Z 296260cf4c2437a82708d346d0a00f10
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0c72eba909,25f10c378d..8230cfa03a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5853065b7ee326c04ddfcde64c178f487af04cd3adc3cc99f559907484ec169d
 -b488b9fb71652eca90d2bf73d32f3d748badf517859dc833c58e021b0e017194
++cee113cc315b04fd75ccc172cf4529bf15b2050bf274433496c31a282e281ab8