From: stephan <stephan@noemail.net>
Date: Mon, 22 Aug 2022 14:03:11 +0000 (+0000)
Subject: Merge in trunk.
X-Git-Tag: version-3.40.0~169^2~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a8a0fceeca3ae88595c539bc2394ea8c74cf793;p=thirdparty%2Fsqlite.git

Merge in trunk.

FossilOrigin-Name: e215d55a97e1ccbca3101621374444d2381d87ef8e8fde5271e31c8b714e43e9
---

7a8a0fceeca3ae88595c539bc2394ea8c74cf793
diff --cc manifest
index 8ae71848be,bfe61c9805..bab5e7c63d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Refactor\sJS\sAPI\samalgamation\ssuch\sthat\sthe\sbootstrapping/configuration\sis\sdeferred\suntil\sthe\swhole\samalgamation\sis\savailable,\sto\sfacilitate\sproviding\sclients\swith\sa\sway\sto\sinitialize\sthe\sAPI\swith\stheir\sown\sconfig\s(noting\sthat\swe're\sstill\sone\ssmall\slevel\sof\srefactoring\saway\sfrom\sbeing\sable\sto\sactually\sdo\sthat).
- D 2022-08-22T13:34:13.519
 -C Add\sthe\snew\sinternal\sinterface\ssqlite3DbNNFreeNN(db,ptr)\swhere\sboth\sthe\ndb\sand\sptr\sparameters\sare\sguaranteed\sto\sbe\snon-NULL.\s\sUse\sthis\swhere\nappropriate\sto\ssave\smore\sthan\s2\smillion\sCPU\scycles\son\sthe\sstandard\nperformance\stest.
 -D 2022-08-22T02:00:26.214
++C Merge\sin\strunk.
++D 2022-08-22T14:03:11.661
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2006,8 -1999,8 +2006,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 00991335c4dae56232e999398e5e82d8161903ba7d084b16a73a150e83f1f782
- R d8e7cfc53479bc2a5e5d34dd2cc26aa3
 -P 2d13ec086e96a5446462ce0f689c40c8196e740cd693f5967bfe9eb961f03463
 -R bf88e8a14ba34da9f9b58cc1ee676092
 -U drh
 -Z 1f007ec3ec70bab2436c890728aeb636
++P 9dbe9a6aecec43b51057375ef1d2d632db0d17eac8b7552c20cc91fc2f1a55d1 e5eaa80e81fdf86f2875a912b880272b8d099b82b08e945a7988c5dd0fe9d6b5
++R 98198d4c07340458e933c1601dce5a74
 +U stephan
- Z dd954bd42edcc1a06b3b31bdffb215a4
++Z cff3826d5874cd44103730340fc5de2d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 174e4d0afc,1388f09e3f..31636b0764
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9dbe9a6aecec43b51057375ef1d2d632db0d17eac8b7552c20cc91fc2f1a55d1
 -e5eaa80e81fdf86f2875a912b880272b8d099b82b08e945a7988c5dd0fe9d6b5
++e215d55a97e1ccbca3101621374444d2381d87ef8e8fde5271e31c8b714e43e9