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

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

FossilOrigin-Name: a8872aa588dd1367997924ea65267af6bd85e076e00f40fe150e3f33ef6d0dda
---

d0c8358982d2eeabab7b2fa72398fe9f3c33d823
diff --cc manifest
index b5e978aaf9,f7b9a608f3..0c0ff9162f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbedrock\sbranch.
- D 2023-08-03T23:26:39.123
 -C Merge\sthe\sjson_remove()\sbug\sfix\sfrom\strunk\sinto\sthe\swal2\sbranch.
 -D 2023-08-04T13:24:40.223
++C Merge\sthe\sjson_remove()\sbug\sfix\sfrom\strunk\sinto\sthe\sbedrock\sbranch.
++D 2023-08-04T13:29:22.504
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -611,10 -605,10 +611,10 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c d2b7f613a1792043f8e758fdcfe9469f9b81f522999b508f436517752a5d7071
+ F src/json.c 9c231a853268ce6aee2e300e26d4445ba42117374a2275f8e9537b2f912909d6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
 -F src/main.c fde8f13c876a658b4e8b74b77d875ca887915c174ea6a2f3122d80966f93d865
 +F src/main.c e56843b488ead74369eeffc64cd5b9d3a7ffbf8621bb0cd695272d9b9ce53afa
  F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -2086,8 -2063,8 +2086,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 1d6ded3234bbfa3226ef718eec8d0ce06ae2844628866cb6197383c9bf06267c 6fa71e11197111ab52d1983b35190899a5881dcb9ed822488c92bc839c72cb55
- R b9c55641cb16099f76bc77535273a425
 -P 6fa71e11197111ab52d1983b35190899a5881dcb9ed822488c92bc839c72cb55 ba7a66db13b28da0b41f03be825a593608474a5ebda89e12d58d89db709b8f65
 -R cef0de709be49642d9e25d028826ad6e
++P 877ffece0531054f24410c9e4c0b89599a9506689cc97233d33c18b9a15e6308 e6c066cae4ed5d698820c0c1ea8840773146e9d1a665551d8d51bb9df121cdb7
++R f29591ff44e4be8f256f1ee1917f1e68
  U drh
- Z 640d187b55e31c3095d500eb8d395e77
 -Z e02f148a6f9cb0e9347800ebbe37eb6f
++Z 7f6deceb53944ea56c408c2d8902af1e
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 2272f288bb,3a11512e69..aa73d845ae
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 877ffece0531054f24410c9e4c0b89599a9506689cc97233d33c18b9a15e6308
 -e6c066cae4ed5d698820c0c1ea8840773146e9d1a665551d8d51bb9df121cdb7
++a8872aa588dd1367997924ea65267af6bd85e076e00f40fe150e3f33ef6d0dda