From: drh <>
Date: Fri, 24 Nov 2023 13:41:20 +0000 (+0000)
Subject: Merge the latest trunk enhancements and fixes into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac8b6e70c9b74ad10f446edc72fb1f78b5560a51;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements and fixes into the jsonb branch.

FossilOrigin-Name: a838ebcbbd9f554fd84a1d3176fb572faaef7d0ec0675f1a5bf9430865dafae0
---

ac8b6e70c9b74ad10f446edc72fb1f78b5560a51
diff --cc manifest
index 35eb7e15dc,388b7e23be..e599440b05
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Inserts\sinvalid\sJSONB\sshould\sreturn\s"malformed\sJSON",\snot\sa\sjson\spath\serror.
- D 2023-11-21T22:36:32.538
 -C CLI\s.output/.once\sto\snot\sredirect\s".timer\son"\sresults.
 -D 2023-11-24T13:26:42.641
++C Merge\sthe\slatest\strunk\senhancements\sand\sfixes\sinto\sthe\sjsonb\sbranch.
++D 2023-11-24T13:41:20.026
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2142,8 -2144,8 +2146,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 fffb7a9538838e26991e6f16ea3138346a30c33ea6c3d3834680ee6d1f6eece2
- R 99205893bc97f055f5ba354365513ffb
 -P 8eb3f40021994f0d25ef9d246873796c84886e5951bb8ab991e1e2df31998484
 -R 4fe37cac3670dbe6545f005ad05562df
 -U larrybr
 -Z 1757b64100a32f4365167da6f792b0f0
++P 306ee66fbd0231a9f5b229e5630d5cc66c9cf08b466d2d9204e79e1f44a16374 ce766ed51f772a960d0b7a52c113b55c7ae90ef35050496d8e2a77547eab1a4d
++R 2d567fb5c8564bb757085304a8a7cd82
 +U drh
- Z ff4b069c664b897025c4d05de8c19bcd
++Z 06b93fe1f53ce3db73ea5eedc1e16e46
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0b616dcb8b,8ab89684f9..4c045a4170
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 306ee66fbd0231a9f5b229e5630d5cc66c9cf08b466d2d9204e79e1f44a16374
 -ce766ed51f772a960d0b7a52c113b55c7ae90ef35050496d8e2a77547eab1a4d
++a838ebcbbd9f554fd84a1d3176fb572faaef7d0ec0675f1a5bf9430865dafae0