From: drh <>
Date: Fri, 6 Sep 2024 15:45:23 +0000 (+0000)
Subject: Update the bedrock branch to include all the latest enhancements from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bd361e9e665e2185e092a1b323d6b6184aaf684;p=thirdparty%2Fsqlite.git

Update the bedrock branch to include all the latest enhancements from trunk.

FossilOrigin-Name: 4a3386ccb80e974538a96b830f0bb3c7802f5ef5a4f2f26d01fa0732fccae9e0
---

8bd361e9e665e2185e092a1b323d6b6184aaf684
diff --cc ext/session/test_session.c
index b1e1765c98,29aeadf537..f0b5a64c54
--- a/ext/session/test_session.c
+++ b/ext/session/test_session.c
@@@ -389,9 -383,10 +389,9 @@@ static int SQLITE_TCLAPI test_session_c
          { "rowid", SQLITE_SESSION_OBJCONFIG_ROWID },
          { 0, 0 }
        };
-       size_t sz = sizeof(aOpt[0]);
+       int sz = (int)sizeof(aOpt[0]);
 -
        int iArg;
-       int iOpt;
+       Tcl_Size iOpt;
        if( Tcl_GetIndexFromObjStruct(interp,objv[2],aOpt,sz,"option",0,&iOpt) ){
          return TCL_ERROR;
        }
diff --cc manifest
index ec7d7b6f49,706d9eecd8..c672a5fb61
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Update\sthe\sbedrock\sbranch\sto\sinclude\sall\sof\sthe\slatest\strunk\senhancements.
- D 2024-09-04T16:54:56.048
 -C Merge\sthe\slatest\strunk\senhancement\sinto\sthe\swal2\sbranch.
 -D 2024-09-06T15:42:31.657
++C Update\sthe\sbedrock\sbranch\sto\sinclude\sall\sthe\slatest\senhancements\sfrom\strunk.
++D 2024-09-06T15:45:23.707
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 3cd3e81b3558a4ff391104b4ecba6966246cd226485841a666105740d0cab95f
 -F Makefile.in fc5916a4b06be9171b51443c328c376fe11fccbc8e42eb5b9de822d230cbefa6
++F Makefile.in 9cd7f11b35e8d1372f327831835273011877d2fafee62a4245c07aec5f3853ad
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc 9f54b105b2ceeab4cf397b9f4a119b22933acf90f0a199acb11a464a2efe6c93
- F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
+ F Makefile.msc d784087f454f007dc0b8f037fb16bfbdba2194356fe26b4add4f5e0e5ef8ce57
+ F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -39,8 -39,7 +39,8 @@@ F configure 49523f0a070b583cea040d26eff
  F configure.ac a100ebf7a07f5dedd319ef547dd467d1676ed059b85a7877aa9c44ac309f7000
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 +F doc/begin_concurrent.md 4bee2c3990d1eb800f1ce3726a911292a8e4b889300b2ffd4b08d357370db299
- F doc/compile-for-windows.md e8635eea9153dcd6a51fd2740666ebc4492b3813cb1ac31cd8e99150df91762d
+ F doc/compile-for-windows.md 4d4bfafda42a7a33f166d23aed4db1bb4ea1e5751595a5cced2bad349fd14652
  F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
  F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
  F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
@@@ -599,11 -595,9 +599,11 @@@ 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 c7473aafbd88f796391a8c25aa90975a8f3729ab7f4f8cf74ab9d3b014e10abe
 -F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b
 -F ext/session/test_session.c aa29abdcc9011ac02f4fa38e8ede226106eaeee7c3ea7d8b2b999a124e0c368c
 +F ext/session/sqlite3changebatch.c d488b42d8fd49fb013a1e9c4535232680dabeb28ae8f9421b65ea0ccc3b430f7
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
 +F ext/session/sqlite3session.c 2190541e6870ceb6609e6cee35d2554c1843e5c556a93657e879c08deba6d124
 +F ext/session/sqlite3session.h 3376dbf372cb00cc0f4e960ca0a0125418638da8c55aad749c9fe7a58a770506
- F ext/session/test_session.c 1f0cfe31fdcc11565f4a4220382bff807448d7b82cb908d67c5506b1fd2d6f82
++F ext/session/test_session.c 6b2e04ebf69a7a5d81f425e5f8194fb03e41da0747f1d5c5555f1b9cfc1ce7e3
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt ca7e9ee82ca4e1c1744295f8184dd70edfae1992865d26c64303f539eb6c084c
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
@@@ -785,7 -779,7 +785,7 @@@ F src/status.c cb11f8589a6912af2da3bb1e
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c c6888598f08dee3d9112a38ef42c8f5c89ca7f3190f4694744d0b84250f4bf8c
  F src/tclsqlite.h c6af51f31a2b2172d674608763a4b98fdf5cd587e4025053e546fb8077757262
- F src/test1.c ecbd27140e63d6d70e221ac7e2aa565a13359c126f432b4469ad80f5d66d62ee
 -F src/test1.c 8d7cd219c004cd2ced60659ebf045025cc5c16ce19d12459589dacd4310f7f07
++F src/test1.c 0936be8efdd657ce7ead7f9f992ff89ec374e70961a14710e7946d2167b14889
  F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
  F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
  F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@@ -857,10 -851,10 +857,10 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
  F src/vtab.c 5fb499d20494b7eecaadb7584634af9afcb374cb0524912b475fcb1712458a1b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 7fe7aa272006e5070b31109757bb45d9e387d4df0c58a7ee56614764aaa39651
 -F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
 +F src/wal.c eb62325a874ff07aceb83fea2db85d36a49d472073b0df5a25782dafbfb7492c
 +F src/wal.h 8d02ab8c2a93a941f5898eb3345bf711c1d3f8f86f4be8d5428fb6c074962d8a
  F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
- F src/where.c c046dd58c3410f7b7528e1e6317cb876398557bad346d568ed8562321a7d002d
+ F src/where.c 7fb55836eb7fd07f0a0d8400c50619fc02cda1f46a617cfb003c2990f040193d
  F src/whereInt.h a5d079c346a658b7a6e9e47bb943d021e02fa1e6aed3b964ca112112a4892192
  F src/wherecode.c 5172d647798134e7c92536ddffe7e530c393d79b5dedd648b88faf2646c65baf
  F src/whereexpr.c 44f41ae554c7572e1de1485b3169b233ee04d464b2ee5881687ede3bf07cacfa
@@@ -2249,8 -2226,8 +2249,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P ff94464cec871bd90634e7e1e4252954eb68e77037dd290b0fbf7747c9b19308 9f530343717a891d57013c5fb58f30e422da391815a7cc79ed8beb1196c89faa
- R a1ecfb325245852a018dcbc57997f57a
 -P 9f530343717a891d57013c5fb58f30e422da391815a7cc79ed8beb1196c89faa d94541ae76b5d8b69f5524f10dcccc0814283f438a03f553848ed631a1983633
 -R 2dd5da76416758dc48549c74c7a6036d
++P cf8f155280100c1a5b79b118875a93686a554d8be55114277f4f7b20cfd7835a f3e3ad6945647c88f41748b5e8ce71c06d6e77ac67c607898af63ea14a91910b
++R 330a9c8704cb143ebf90334a590b8710
  U drh
- Z b7ad2ce93a9728b7a6f18d7ba0fe6b4e
 -Z 25441136712759d21b11a407dc6d1e24
++Z 7d17e0ab995cc46d1cd21869a2b767f1
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index eca469b99f,55d986d9fc..58cb2cb963
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cf8f155280100c1a5b79b118875a93686a554d8be55114277f4f7b20cfd7835a
 -f3e3ad6945647c88f41748b5e8ce71c06d6e77ac67c607898af63ea14a91910b
++4a3386ccb80e974538a96b830f0bb3c7802f5ef5a4f2f26d01fa0732fccae9e0