From: dan <Dan Kennedy>
Date: Fri, 23 Sep 2022 11:30:24 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Tag: version-3.40.0~91^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdbd097280f953f96731d908621b5fdb6c8307a0;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c
---

bdbd097280f953f96731d908621b5fdb6c8307a0
diff --cc manifest
index c20e260d60,d10a20caee..92d350697a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\swindows\sbuilds\sof\srecover\sextension.
- D 2022-09-15T03:54:52.116
 -C Reduced\sand\simproved\scomments\son\sthe\sconstraintCompatibleWithOuterJoin()\nfunction.
 -D 2022-09-21T18:21:31.342
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2022-09-23T11:30:24.654
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -549,10 -536,10 +549,10 @@@ F src/callback.c 4cd7225b26a97f7de5fee5
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
  F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 -F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 +F src/dbpage.c 433f13b34f1e5a84cbb5f10214c12471c6f0197f276389634a1cc393ec821c3d
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
- F src/expr.c 24e828db6b2fab8aabfb5d2c0d83dbdfc5a1972b1147fa893350e317ab7e282f
+ F src/expr.c 1cbdd76eeedb729ea9060df03e3e6b74a302784a13bfa38794a8194f894641ea
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
  F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
@@@ -601,8 -588,8 +601,8 @@@ F src/printf.c e99ee9741e79ae3873458146
  F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c ccce37e7fbe71089cf6aec91e7134c9c0c1d4840cff9f02587bbc71240d914a5
+ F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 -F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
 +F src/shell.c.in 36d5792e35515f2389f175b41486b78b1ad6e571799e3c9b211f47c3629f96e5
  F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@@ -2012,8 -2000,8 +2013,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 d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3
- R 9e3a41d484514f69e10e038c6c38b48d
 -P 501609eddf2a46d51e8cd56477a22d4df142a166e78fe4322c0db11d1eed6687
 -R 5d32b5cf2b23f775eb14de7cc8da03e5
 -U drh
 -Z 712cc37fc63bdeb87733f2b1fa708ae7
++P abcbb6abfe08fc590123f0aa1bd72cfdecc75908f078f1348dc0e957de98bf52 38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1
++R 6b2b96167d95e43311ba941f50355c02
 +U dan
- Z 602ce8dc722093a825536633983df6e0
++Z abbafc4cd8c328672c6dcbf15b485242
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c8d62a0caa,065a0d4be2..696d9dd5ab
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- abcbb6abfe08fc590123f0aa1bd72cfdecc75908f078f1348dc0e957de98bf52
 -38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1
++e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c