From: stephan <stephan@noemail.net>
Date: Wed, 8 Feb 2023 08:49:52 +0000 (+0000)
Subject: Merge wasi-patches branch into trunk.
X-Git-Tag: version-3.41.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51b0373998e820ba81bab459e9134c4a9cec6225;p=thirdparty%2Fsqlite.git

Merge wasi-patches branch into trunk.

FossilOrigin-Name: 9902e66a37d59c1909593bbc296091df3fa3bfa12ec7062bd84e458030f77c8d
---

51b0373998e820ba81bab459e9134c4a9cec6225
diff --cc manifest
index b1319ebcd5,34aa88c15d..27ea0b142c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\stest\sscript\sproblem\scausing\s"make\stest"\sto\sfail\sfor\snon-RBU\sbuilds.
- D 2023-02-07T18:41:23.632
 -C Merge\strunk\sinto\swasi-patches\sbranch.
 -D 2023-02-06T22:25:18.370
++C Merge\swasi-patches\sbranch\sinto\strunk.
++D 2023-02-08T08:49:52.993
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -622,8 -622,8 +622,8 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c c3ce1b49cca2c66c8c88fe7d9e1f3db23590deb4dd631619ad90e1e5d21bcf1f
- F src/shell.c.in 250817509dbf12e258e334fdcd87901e35a6b63dc285885fec5f577ebb67b498
- F src/sqlite.h.in e26116b4dba94903c78db0f3281493435cf70ee049e2e8270b1013fad740fdb1
+ F src/shell.c.in 623d793be69c1d9592447fa6e1dbabfce46758821f2b63d6cde2c8cd1d472641
 -F src/sqlite.h.in 2b41f4908dd16cecb3754fe3fa2287a27ee825fb75d508ff2d7546b14e5a6ae6
++F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
  F src/sqliteInt.h 43eeee1ea80543a0e40444bf53643ca259a2b1158ccfe859a6a6435b7358ecdd
@@@ -2045,8 -2045,8 +2045,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P a95dbfae6133cc7aac950c3e7ba55a29d80b1625c39479a7d1d10b0868ee2be4
- R eadbc6d63430234ac2cb17610c353b99
- U dan
- Z b7b3585268bb0984169cdf414e4a24fd
 -P 2ce89f5efcdb8b4c58eb2d30833a76d79ae0134c31d5ab8564be9e1cf5a1f4f0 90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63
 -R 2e77a26949b44b09dd8f8ca35737dffa
++P 2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941 656d36f50f630da68262469087bad1ac71b10325e233a7963103c8cbc232f61a
++R 7644b35acb2adcbe9465af90730ac93f
++T +closed 656d36f50f630da68262469087bad1ac71b10325e233a7963103c8cbc232f61a Closed\sby\sintegrate-merge.
+ U stephan
 -Z 44d444cd7a6c34a7e1e49f10a3684c72
++Z faa4f9c7961b812c919d8c373bc1fa2c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 40eb42fb45,0b3d7aac55..88dc084a67
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
 -656d36f50f630da68262469087bad1ac71b10325e233a7963103c8cbc232f61a
++9902e66a37d59c1909593bbc296091df3fa3bfa12ec7062bd84e458030f77c8d