From: dan <Dan Kennedy>
Date: Tue, 5 Mar 2024 18:03:28 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7176860f36bea1b7e8bebea1ec2c082a9e36745;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: a003fffafdb532de4ff3876a81e73dbccbdf83debecd83a2a9ae2d449bf02adc
---

a7176860f36bea1b7e8bebea1ec2c082a9e36745
diff --cc manifest
index 9ea1a2365c,b875311c58..d1d51da4b2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\swith\slarge\svalues\sclauses\sand\snamed\svariables.
- D 2024-03-05T17:48:20.852
 -C Reformulate\s[34439fe3aeea7cbb]\sslightly\sto\sresolve\sa\sfalse-positive\sOOM\sreported\sin\s[forum:2eadfe94e3|forum\spost\s2eadfe94e3].
 -D 2024-03-05T17:33:04.627
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-03-05T18:03:28.571
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -709,8 -709,8 +709,8 @@@ F src/hash.c 9ee4269fb1d6632a6fecfb9479
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
 +F src/insert.c 455bd07274de3e58974ccbf755ac6fb8ca47db00ee3c36f7173028c5fab29b11
- F src/json.c 3b4e2778d95d923d6d77e8a5efd51a6265017b466782d597303f5f094fcd68af
+ F src/json.c 9337dac9d9d4c77461db55fd3e06e4d006f4283cb1da2b3a9b1f8d750701583e
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
  F src/main.c 438b95162acfa17b7d218f586f5bde11d6ae82bcf030c9611fc537556870ad6b
@@@ -2177,8 -2176,8 +2177,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 9cbceaac8f3c557f6eb266e15c57d71d3b6ad5dfdc8c0c39e5fc75e505673d17
- R bd90450bf431451c0d4f9f17277c3ef8
 -P 952ed71b9b61e79fe807ac3134bdfa7c94a415e02f13f94440a34d6d548d171e
 -R 7a7e70231da662a6d891be7e73e90380
 -U stephan
 -Z b9dbf98318196caf6d04789a6da016ae
++P 4784a92e567013632ea833d8747bc304ae39aaa9c2dff66198cda53797ec3ab7 8290646792bc5411112b0c01dc5ac0837743056a7679725ee2edefef2e10d146
++R ed3feaa2ba2f3d55860d55573371a912
 +U dan
- Z 47c070dacdaf2a30943a10818d6b8541
++Z 7b3184a27c83c890e77e2b23a3919d24
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 846cdb3258,59d20d5266..c28564c265
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4784a92e567013632ea833d8747bc304ae39aaa9c2dff66198cda53797ec3ab7
 -8290646792bc5411112b0c01dc5ac0837743056a7679725ee2edefef2e10d146
++a003fffafdb532de4ff3876a81e73dbccbdf83debecd83a2a9ae2d449bf02adc