From: drh <>
Date: Thu, 12 Oct 2023 17:47:50 +0000 (+0000)
Subject: Merge fixes from trunk into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7ad9f65fa49b67c4ff5491f0231daa18f78afeb;p=thirdparty%2Fsqlite.git

Merge fixes from trunk into the jsonb branch.

FossilOrigin-Name: a760bd7bcc63aac41c989bb5f4fbc927f9a93fe9c0aa18da2f0131483ec3f189
---

c7ad9f65fa49b67c4ff5491f0231daa18f78afeb
diff --cc manifest
index 29b386a1a6,35a1ad45df..addf7011fa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\suse\sof\san\suninitialized\svalue\sthat\soccurs\swhen\sdoing\sa\sjson_insert()\nof\sa\sstring\svalue\sthat\scontains\sembedded\sU+0000\scharacters.
- D 2023-10-11T17:21:16.637
 -C Make\ssure\sthe\sjournal\sfile\sis\sclosed\swhen\stransitioning\sinto\sMEMORY\sjournal\nmode,\sto\savoid\san\sassertion\sfault\sin\sthe\snew\ssqlite3_randomness()\savoidance\ncode\sadded\sby\s[c84e4483cb44f827].
 -D 2023-10-12T17:41:18.510
++C Merge\sfixes\sfrom\strunk\sinto\sthe\sjsonb\sbranch.
++D 2023-10-12T17:47:50.731
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2129,8 -2128,8 +2129,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 fb81d570a3d9b8f55e9f278d5240605c5d0f3c5abde51550797999d03cf193a7
- R d78e19c15a2441ced442368555cb1a45
 -P 286d1e8012a5f5d9e1fe6dce1a732f725b8a1837f66daf6aefb792e19e96f2d4
 -R 63c272f1ac84380bbc1d2409b6f281ca
++P fc5ee9e51ad4556af526a6cefca5ae5a3b1b7affc4edf09832491d6b4f4ba366 29937081a986d88f495ad48748c35ff5829f0ac31dd4ad3e48d180ae2fcb9a0c
++R 34f098f7c4eafcb6644778066535a3a0
  U drh
- Z 3bf927da2cbd54464f0b6fb8e90f7a35
 -Z 6db7b813ea2dc81e78e187c7332821c2
++Z dd04631a3fb3a59b7149d92d361ffe54
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0fb4b428b2,d8626240d8..643a123acb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc5ee9e51ad4556af526a6cefca5ae5a3b1b7affc4edf09832491d6b4f4ba366
 -29937081a986d88f495ad48748c35ff5829f0ac31dd4ad3e48d180ae2fcb9a0c
++a760bd7bcc63aac41c989bb5f4fbc927f9a93fe9c0aa18da2f0131483ec3f189