From: drh <>
Date: Wed, 26 Jul 2023 01:15:34 +0000 (+0000)
Subject: Merge the latest trunk fixes into the json-opt branch.
X-Git-Tag: version-3.43.0~114^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a757026c5e8ba7d61d1b178ab98178d3264c880f;p=thirdparty%2Fsqlite.git

Merge the latest trunk fixes into the json-opt branch.

FossilOrigin-Name: ef4e1664d159b98854d9aa580b0bb942f1726f32a190e2ea659c171131ddce9a
---

a757026c5e8ba7d61d1b178ab98178d3264c880f
diff --cc manifest
index 0cb9a5f796,f9ef9ad44c..44f7e7b86b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sconcept\sof\san\sRCStr\sstring\s-\sa\s"Reference\sCounted\sString".\s\sUse\nthese\sto\skeep\strack\sof\sbig\sJSON\sstrings\sthat\smight\sneed\sto\sbe\sused\sin\nmultiple\splaces\sat\sthe\ssame\stime\swith\sdifferent\slifetimes.\s\sAdd\stwo\ndifferent\sJSON\sstring\svalues\sto\seach\sparse\s-\sone\swith\sand\sone\swithout\nchanges.\s\sThe\snet\sresult\sis\sa\slarge\sreduction\sin\sthe\snumber\sof\sparses\nthat\soccur\swhen\sdoing\san\sUPDATE\sof\sa\sindexed\sJSON\sfield\susing\njson_replace()\sor\ssimilar.
- D 2023-07-26T01:12:08.723
 -C Fix\sa\sharmless\s"set-but-not-used"\scompiler\swarning\sin\ssqlite3session.c.
 -D 2023-07-25T17:54:25.000
++C Merge\sthe\slatest\strunk\sfixes\sinto\sthe\sjson-opt\sbranch.
++D 2023-07-26T01:15:34.571
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2044,9 -2044,8 +2044,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 28c6e964b1e2257527df02b352f02e135f7c4b764b8b41eda6461f9538f5d042 2dbb22c75e86f2e3ced38ac14b4943570d5c2f86cd5e37e875bf0c863be28836
- R 80113afdab5484e027b5180529a678b7
- T +closed 2dbb22c75e86f2e3ced38ac14b4943570d5c2f86cd5e37e875bf0c863be28836
 -P 907dfc4a7aa129cdcedeb3ba2d75e1b68a8f22c2545ee1c8cf7d705041644e5c
 -R 262b3aa3dc9bbec239621d23dc374114
 -U dan
 -Z f47917699640df15bd88b843742372bf
++P a4c1af616e672a0d4d04f2652e645617758231598fb7161b956883512303ae87 54b3c43fdfdaca6b129a5f0ee93c34eb001663775d33c087066650f5e164d1c1
++R 31a2d8c82324ae8c8feb0c4037e19a24
 +U drh
- Z b150fbb50a544ff974ea79d1ca7ea6fb
++Z df17bf2cf88062fccaa06a3f8068b84c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c81f6e6269,7561758d66..80d363ba5c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a4c1af616e672a0d4d04f2652e645617758231598fb7161b956883512303ae87
 -54b3c43fdfdaca6b129a5f0ee93c34eb001663775d33c087066650f5e164d1c1
++ef4e1664d159b98854d9aa580b0bb942f1726f32a190e2ea659c171131ddce9a