From: drh <>
Date: Fri, 4 Aug 2023 13:24:40 +0000 (+0000)
Subject: Merge the json_remove() bug fix from trunk into the wal2 branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7331bc000213223e4a0d6b4bc8307632e1080071;p=thirdparty%2Fsqlite.git

Merge the json_remove() bug fix from trunk into the wal2 branch.

FossilOrigin-Name: e6c066cae4ed5d698820c0c1ea8840773146e9d1a665551d8d51bb9df121cdb7
---

7331bc000213223e4a0d6b4bc8307632e1080071
diff --cc manifest
index 726103ecf1,76f5f962e1..f7b9a608f3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2023-08-03T23:22:28.907
 -C Fix\sa\sbug\sin\sthe\sjsonLookup()\sroutine\sused\sto\ssearch\sJSON.\s\sBug\swas\nintroduced\sby\sthe\srecent\s(unreleased)\sJSON\scaching\senhancements\ncheck-in\s[a4c1af616e672a0d]\smerged\sinto\strunk\sat\s[df099ad713011b67].
 -D 2023-08-04T13:19:11.464
++C Merge\sthe\sjson_remove()\sbug\sfix\sfrom\strunk\sinto\sthe\swal2\sbranch.
++D 2023-08-04T13:24:40.223
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2063,8 -2049,8 +2063,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 c1fa1cb5e0c420614481636f3ce2dd9ad2142274bb7b37d39e5c26228317f992 65a8716d8a1b7c5cffe9cdd25e4cbfa6528fcb146ff0fe67b0ce771b0537473d
- R 13b5f6b13ebbc83b88c57882557cc6aa
 -P b7de399c277394a6a3bbf253d4177aa82753271e5087b98b2c2268f629a7dfdd
 -R 0023494055da434d093283e3467ed659
++P 6fa71e11197111ab52d1983b35190899a5881dcb9ed822488c92bc839c72cb55 ba7a66db13b28da0b41f03be825a593608474a5ebda89e12d58d89db709b8f65
++R cef0de709be49642d9e25d028826ad6e
  U drh
- Z 55ba709fa89a3677efea29f788630ff5
 -Z fcef72d2f53678066563a17e3c8f660b
++Z e02f148a6f9cb0e9347800ebbe37eb6f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6ba6b0bad8,e5cb58fc65..3a11512e69
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6fa71e11197111ab52d1983b35190899a5881dcb9ed822488c92bc839c72cb55
 -ba7a66db13b28da0b41f03be825a593608474a5ebda89e12d58d89db709b8f65
++e6c066cae4ed5d698820c0c1ea8840773146e9d1a665551d8d51bb9df121cdb7