From: drh <>
Date: Tue, 21 Nov 2023 17:54:55 +0000 (+0000)
Subject: Merge all recent trunk fixes and enhancements into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e97f295783b79b323159a1c1f5fa7a2d38a2611f;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 6d78d50ed2357e6c943c1ef97b1d2ea0902cbadef90c2c35dccdbdc2bdf8702f
---

e97f295783b79b323159a1c1f5fa7a2d38a2611f
diff --cc manifest
index 7339368a54,721aac63bc..0e2a5d70fc
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Make\sedits\sdirectly\sto\sthe\sJSONB\sBLOB\swhen\sthe\sinput\sto\sjson_replace()\nis\sa\sJSONB.
- D 2023-11-21T17:51:58.335
 -C Fix\sthe\strace3-4.4\stest\sto\sbe\smore\srebust\sagainst\stiming\squirks.
 -D 2023-11-21T12:02:04.720
++C Merge\sall\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\sjsonb\sbranch.
++D 2023-11-21T17:54:55.986
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -795,10 -795,10 +795,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 8b8e0c687e8dc355dfbdd40bf1cfa57effbaf3efeb0d634296d547c8549cc4ac
 -F src/vdbe.c 319af2cf092d20e233e8ad4267ae49bfe33c50ac4db4ee7e47af898f824c2368
++F src/vdbe.c a5bf636ef502cfac538418fbf537a5e0cf825c7ce9ff784cddee2eb813dfe7a7
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
 -F src/vdbeapi.c b07df805110dc6e81f2a3f9cd4e83f56ea523277a59bcec489a12b740c1079e7
 +F src/vdbeapi.c 8f57d60c89da0b60e6d4e272358c511f6bae4e24330bdb11f8b42f986d1bf21b
  F src/vdbeaux.c b34dfbc09403ccb676608da16ff0780d23d466470563d24fdf6350b8d2271d5e
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
@@@ -2142,8 -2140,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 162f0509ef27bcd3ec87629640281a71c773e7c3bbd2cd0df76faf481531e7f1
- R 38409c37dc02439917dd59332bdf58d4
 -P f5b3eb0fc8936ba274a7654ff6dfa7d4654bd8dbca7f3a5ec1134b0b5260d59d
 -R c3df342b9429d8c9fdce76751979c422
++P d69c6acef54a81f46a97a05d443fe648635b4b70772069d6705ef829b718e985 8936daa08243729d8538bb7288bbefb43f3bd842a0d4b2e8019092f5701c2926
++R e8c6337278c34718864f8e382e5ab75f
  U drh
- Z 4892279bd4eeae014e8915fe6a430955
 -Z 57a5e144d820d25acd5cfb831cc09e5a
++Z 78714a658254db90406116c46e75110c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4a62c55635,73e608bdbe..d87fbc1eaf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d69c6acef54a81f46a97a05d443fe648635b4b70772069d6705ef829b718e985
 -8936daa08243729d8538bb7288bbefb43f3bd842a0d4b2e8019092f5701c2926
++6d78d50ed2357e6c943c1ef97b1d2ea0902cbadef90c2c35dccdbdc2bdf8702f