From: stephan <stephan@noemail.net>
Date: Sat, 21 Jan 2023 12:18:28 +0000 (+0000)
Subject: Merge trunk into wasi-patches branch.
X-Git-Tag: version-3.41.0~35^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdcb84ef00da4a9b367e6536149634f633c41c71;p=thirdparty%2Fsqlite.git

Merge trunk into wasi-patches branch.

FossilOrigin-Name: 6fc20d75d49310aedbc3351a4a5f1aa9ef5b4100501c7bfbe556aca2be2e44d7
---

cdcb84ef00da4a9b367e6536149634f633c41c71
diff --cc manifest
index a10ed5916e,85e5ff337a..bf4dec75d1
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\strunk\sinto\swasi-patches\sbranch\sand\sadd\smissing\syes/no\sresult\sto\sthe\sconfigure\sscript's\soutput\sfor\sthe\s--with-wasi-sdk=PATH\stest.
- D 2023-01-11T22:45:20.283
 -C Fix\sa\smemory\sleak\sin\sthe\sTCL\stest\sharness\sassociated\swith\scarray.
 -D 2023-01-21T00:59:20.911
++C Merge\strunk\sinto\swasi-patches\sbranch.
++D 2023-01-21T12:18:28.661
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 245bde71d86b7e57bf9933b4d27526279fe434361dd39f9432183e9646a9ee4e
 -F Makefile.in 4bba1e74ea2ffc95b9f299d72aebec06dc55c2d93948c93a2f356cc9682912ea
++F Makefile.in 7608208f680a288a7e84717a74d05db789dbf4deba2c905ef7c17482f2bc4ef6
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 5a13f784bd91c246673648f056e7f3193c45d53dff874eecde547ec854c292b8
+ F Makefile.msc 6de67bb5a8e849f9a7a11085366cc8daf99845fa21368e89b3cd195abd62cd2a
  F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
  F VERSION 413ec94920a487ae32c9a2a8819544d690662d6f7c7ce025c0d0b8a1e74fa9db
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -640,17 -615,17 +615,17 @@@ F src/pcache.h 4f87acd914cef5016fae3030
  F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
  F src/pragma.c 23e74aaa441a03e6d97098db5883f53ee50cc50d294ecefb916437b8484012b3
  F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
- F src/prepare.c 9ebd3a1b12bbd1951f0d6db850f32cf5d4547a6ab8bb9e958d75dfbe4e60d0a3
+ F src/prepare.c ce87a08cfddd45a147150db34190b1986f2d4a0e0828858cb6bd908c78fb02e3
  F src/printf.c ff4b05e38bf928ff1b80d3dda4f977b10fe39ecbfe69c018224c7e5594fb2455
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
+ F src/resolve.c 5a98a7bf277aa60584b6bb4c5dd6a9ef2b19537910612c34f596e2901e88596d
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 146222acbf9ea4e7f99c45a9e3cb4a0ba7e02c4f0df5186094ea1f9ea9907a02
- F src/shell.c.in 007d30baf6aa51e5b7148facab9c5a92ada9e684a2436b70062c7cbca320d1b0
- F src/sqlite.h.in 7be540a872826ab3374534b4dae855faf03b28db78e995e6fe98cb833c3607c4
+ F src/select.c d389ccdb96855dbfaadc22d936889e1f0652ffca17e31a6b6522b45d99daa8ce
 -F src/shell.c.in ef6031840e423231593dfc3f27faa68f917a6267f149bc8d4e4d80a3fa8a1a79
 -F src/sqlite.h.in 814923254ec52b541eeb7787a09a25e416b9a46333dfbfec324014b9919fd77f
++F src/shell.c.in 5795ec29ce0169ba5d084ef55cb6064c6fdf7cd3ad175873f3abfd71a307fb3d
++F src/sqlite.h.in 67749bfeae75c78184248fb867f600a8795ad3b4ecacbfd8c9d53eadef51f7b3
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
- F src/sqliteInt.h 079ccd9c161f4b74967188fd6321810159fdc4c32371b68559719828fac20f43
+ F src/sqliteInt.h 43eeee1ea80543a0e40444bf53643ca259a2b1158ccfe859a6a6435b7358ecdd
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2068,8 -2043,8 +2043,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 478fe96ee7f3ffd5732231b75e6f04e898a59368b3c91f79e6af9496dfcef6d3 7526c46632578a2b602622b9debc406b52af4a42cc880970c4307d13853d59d3
- R 5ee0a5dc148df08bb72fa9f7b42ab4d1
 -P ded60f5b3431283d70eb8c41761c0fa9727021e6309d0df0ae3fb0a5274c1299
 -R 263b99d5b2eb9217327321bdb9380ba3
 -U drh
 -Z deff6bbe33acca00c1d412bded682d75
++P adc0ede0a43241b85563408d0de8e640a75ec4f7bdfe5e48acc5cdd6b182b88c 5a316f9fd94b73fc54ef94a1dab2f13bdd16c4fb13d2620b7c907d104d5b4d7a
++R de6b861425c8d5878acd44fd86977c48
 +U stephan
- Z 38bf5f86327b02eef8312b8f75a4ee2f
++Z f0c9570019c6692ba71970c30a38e676
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index ffbab4fa11,5adef23279..48c531cc76
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- adc0ede0a43241b85563408d0de8e640a75ec4f7bdfe5e48acc5cdd6b182b88c
 -5a316f9fd94b73fc54ef94a1dab2f13bdd16c4fb13d2620b7c907d104d5b4d7a
++6fc20d75d49310aedbc3351a4a5f1aa9ef5b4100501c7bfbe556aca2be2e44d7