From: drh <>
Date: Fri, 28 Apr 2023 10:23:01 +0000 (+0000)
Subject: Merge all the latest trunk fixes and enhancements into the json5 branch.
X-Git-Tag: version-3.42.0~73^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea2529528ef9f195bbf03c980eb254581aae2bcd;p=thirdparty%2Fsqlite.git

Merge all the latest trunk fixes and enhancements into the json5 branch.

FossilOrigin-Name: b5ca15cfc19380cf870b70be6a86e70f2026cc3d6d89005b45891d58c4f11c2d
---

ea2529528ef9f195bbf03c980eb254581aae2bcd
diff --cc manifest
index dcbc60c91c,9f1cd11163..b8b8e777ef
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Test\scases\sadded,\sand\ssome\sbugs\sfixed.
- D 2023-04-27T23:29:09.447
 -C Do\snot\sassert()\sa\sbad\sstring\srepresentation\sin\san\ssqlite3_value\safter\nan\sOOM.\s\sdbsqlfuzz\sc822a17a23c524a0ac7cfb203c7198209da15de8.
 -D 2023-04-28T10:10:52.120
++C Merge\sall\sthe\slatest\strunk\sfixes\sand\senhancements\sinto\sthe\sjson5\sbranch.
++D 2023-04-28T10:23:01.697
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -700,15 -701,15 +701,15 @@@ F src/trigger.c ad6ab9452715fa9a8075442
  F src/update.c 3f4fb5ad7c9b48d7911974d6579192bb3a6c27f46140b6cbb9139cc8a77b8691
  F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 -F src/util.c b1d8d87c4c8c77e70f48c43f91444fd66d91532693573b70b837afd572010176
 +F src/util.c d4bcb560471cd94e6e17d448311f8d5bf81a7e5276295a53501058ef1b95dd1a
  F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
- F src/vdbe.c a6c52ba65e8ceb574fe0eda62af84e6c50c176ffc5f310c613425f7ab2b1484b
+ F src/vdbe.c 94d5520d2a287216c47e6fb641ee88ffd934b0d40c235d693d38bcd0e0750357
  F src/vdbe.h 637ae853b7d42ae3951034cc63ab7c8af837861f79504cdb5399552fcd89a884
  F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
- F src/vdbeapi.c 1a95162e26d5eda3b7b46fbe4fcbc33eb7f801529d66fc2e14c52094a5523339
+ F src/vdbeapi.c b4982cde547054c4f7341198db3c3008a48e1eb028f757601bf5bf2fc026cbcf
  F src/vdbeaux.c 6ee48db408d4c297a363f1e31145c09793a580e7c508bb36063dd017d67117a2
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 1d9a0f37b0097fbb53f0d7ba081f7181b83cee2c6f46364706ea0c3896bd8ec0
+ F src/vdbemem.c 1cac4028c0dabbf1f3259f107440e2780e05ac9fe419e9709e6eb4e166ba714b
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@@ -2064,8 -2060,8 +2065,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 bb8f1c16f244f893170f3d03bc445bd15fc337804c7c3e76c548397f5b95b39a
- R 6a60f8ad3d57ac84f5b8c0860a0c4b76
 -P 2779f9270cc431786d0e16ef05ec05b0f22dda2307f3bf17467ad0b25304e160
 -R fcf6991862458e9816409ec8d717ddc8
++P bc84a82e4ddc1b71025c56c49e62a44f0b12fa87a6417ad61967d9d3121a0d4e 91fee79a01971259b21478e60a069a711a00efc79ddfececa6224a152cd8d09a
++R 454da0ecccffebadc86f13fb2a470b64
  U drh
- Z d1a0a8388ccda2f713b3fe179f34f0f5
 -Z d3df2b888a0fbd6bd36c6662515c45b3
++Z dbd4148e71a7855c43311d70f48a2c21
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 89e8dac194,e2c06ba976..eb3f235ab7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bc84a82e4ddc1b71025c56c49e62a44f0b12fa87a6417ad61967d9d3121a0d4e
 -91fee79a01971259b21478e60a069a711a00efc79ddfececa6224a152cd8d09a
++b5ca15cfc19380cf870b70be6a86e70f2026cc3d6d89005b45891d58c4f11c2d