From: drh <>
Date: Mon, 6 Jan 2025 20:12:59 +0000 (+0000)
Subject: Merge all the latest trunk changes into the begin-concurrent branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10345cff80ddb1e452b588f653c468469244c6db;p=thirdparty%2Fsqlite.git

Merge all the latest trunk changes into the begin-concurrent branch.

FossilOrigin-Name: 3703a844374743d7daab34c5db271aaaa7776f60729e67214e4e4f27608d139a
---

10345cff80ddb1e452b588f653c468469244c6db
diff --cc manifest
index 26d3d8925b,dfe068dcb6..a5ca30b343
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2025-01-03T15:21:47.659
 -C Fix\sa\sminor\sproblem\swith\sthe\ssqlite3_get_table_printf()\stest\sinterface.\nNo\score\schanges.
 -D 2025-01-06T18:32:53.875
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sbegin-concurrent\sbranch.
++D 2025-01-06T20:12:59.614
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
  F Makefile.in ad349acf91b3569033439fe498fa197aa530cafaa01362eb7daad2f84e43d265
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
- F Makefile.msc 28af67e6bd0df8d41f305cce235737d1b7e40511e9e56b8456d651c00acc7bbe
 -F Makefile.msc 39785ec45f9ae0311e49094eff2ee079562246fed6be3b9f632a99d4df20056a
++F Makefile.msc 51a67e4dd1280b02db6517222b296b10e21e315e1750d580f5fdb290f1e7ce80
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -61,7 -61,7 +61,8 @@@ F doc/json-enhancements.md e356fc834781
  F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
  F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 +F doc/shared_schema.md 759fc374709fccf4e5d2d0cbd05f8fedd38fb022bdd8a6c5b5f492684c7023b9
+ F doc/tcl-extension-testing.md fca7b123e6f6c94f87c5e9285342fa08d17f118d47bea22c0b045485755fe9c3
  F doc/testrunner.md 15583cf8c7d8a1c3378fd5d4319ca769a14c4d950a5df9b015d01d5be290dc69
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
@@@ -614,10 -614,10 +615,10 @@@ F ext/session/sessionrowid.test 85187c2
  F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
  F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
- F ext/session/sqlite3session.c 3d0a7f0f7a1c946e01818c716a55a40ae30542a29a9045cb05daf7fb658cdafa
+ F ext/session/sqlite3session.c d6f5e3e83b9b0bbc4a8db4837284f0ecc6af5321d4c8e7136380b456b278c46a
  F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b
  F ext/session/test_session.c aa29abdcc9011ac02f4fa38e8ede226106eaeee7c3ea7d8b2b999a124e0c368c
 -F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 +F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
  F ext/wasm/GNUmakefile 311aa0d5edc7006409962cc77cc26560d92f9be69c2c4302e8bbc68189fd02db
  F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
  F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
@@@ -700,7 -700,7 +701,7 @@@ F ext/wasm/tests/opfs/concurrency/test.
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
  F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 9cc67df19c97344916ff7d396aa7300e34d723527fcfe6e631a7e6a22aecc2af
 -F main.mk fe86d83158b547e02f8d08aa6af2130540746a4a61de7c61ea8b9d09eb06acd4
++F main.mk 45e40d904758893578e0185ab975656424f69d237d43a12b3404ca01859da4b6
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -779,17 -779,17 +780,17 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e
- F src/shell.c.in b183eccfa3f52ede8455bd0f71cfdddeaa7180fb048c0b1c99de87074669daa3
 -F src/shell.c.in a9c0f8066eac40f1f97b8554bb0462b07263d5c02380cc1ef74734c5d1c67637
 -F src/sqlite.h.in 6afbcaae44140216704a6c82e4c4ea4118c46d5f6573d6c5fa4fc901ed9d369e
++F src/shell.c.in 32ae9365992cbf53c6ec7ca6bb306cebbced45944427da5806c96114fa2252e7
 +F src/sqlite.h.in 051ecb184e142af5a1465c0ae42c81d92ea32a8d73463a43da05ebcff206f7b7
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 -F src/sqliteInt.h 3f20dfb5ae54e787b2643edc0b5bae0cecddfb89988e28afdc3c0b05892e25cc
 +F src/sqliteInt.h 965688f4a887ce4747452002c148d5035757e58974215731d56e0024d876e412
  F src/sqliteLimit.h 1bbdbf72bd0411d003267ffebc59a262f061df5653027a75627d03f48ca30523
 -F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 +F src/status.c 5028a0afee355aa492f26f0b6a3ec23145caa9261a93164d96cd0b9bf1b2318f
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07
 +F src/tclsqlite.c 0ee1a54f90615bcef1bc7c70daa2e51db807a69ce2adde29fdf3b38dd42765aa
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
- F src/test1.c 2d507751bfb4aa254dc22588ef1e3c5c5cfcb2e636d0e6e1fa0bbd307669c2a8
+ F src/test1.c 7f5579f2786c11cf4391ec2abb7b5b5b234ca1408599d7a0d6dd32360e5f58d8
  F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
  F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
  F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@@ -2216,8 -2205,8 +2217,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5149d50f3473f2035fe6a9b0e25e33e58f95149a7a39bd19e678ed4cc7de6ccf 9ee57a30a49d9813bf2669a5d8346f7e018e3fbf1792739951311a8d3a249d45
- R 5d137891c984d64e6aa146cf0d9ebef1
 -P b1cc53fa3fb2ac3abeadd3282d8751f4d533315754159f16ca7f7f300ccdd8c8
 -R b841ee7b12f689b8a9384b533ea34d09
++P 3b485202da8358c4495fd76dae13f739e1206c12fe10b26df719ad1aaccb3401 a0df29c7a3eb4f558aba00598d827643830591def3101a4d5464543527b8d13c
++R a46ba8d0ddd61da2e5714f048be91a2d
  U drh
- Z 3d13110430e8f298320ce67d6396aeee
 -Z b3de29be7899c08cf5113466b37b5222
++Z 773228cfc347d76094d41d0b6d46b6af
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index d57996b8ac,c9d8176551..74c6a64c8d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3b485202da8358c4495fd76dae13f739e1206c12fe10b26df719ad1aaccb3401
 -a0df29c7a3eb4f558aba00598d827643830591def3101a4d5464543527b8d13c
++3703a844374743d7daab34c5db271aaaa7776f60729e67214e4e4f27608d139a