From: drh <>
Date: Fri, 5 Apr 2024 14:50:12 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the wal2 branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7e87a53c74a936a8ffdfaec6cb030e7a74e830e;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the wal2 branch.

FossilOrigin-Name: a8a8a2db9b879c543fb3fd25cf66717a3dfdf9857dcd1ab9a98b31fbc85dbfc9
---

b7e87a53c74a936a8ffdfaec6cb030e7a74e830e
diff --cc manifest
index 8a62d259d6,8b598b2633..73f3c47413
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2024-03-26T10:42:52.236
 -C Check-in\s[a9657c87c53c1922]\sis\swrong:\sthe\sIndexedExpr.bMaybeNullRow\sflag\sis\nrequired\sfor\svirtual\scolumns\sif\sthey\sare\spart\sof\san\souter\sjoin.\s\sAdd\sa\ntest\scase\s(derived\sfrom\sdbsqlfuzz\sb9e65e2f110df998f1306571fae7af6c01e4d92b)\nto\sprove\sit.
 -D 2024-04-05T13:56:05.021
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
++D 2024-04-05T14:50:12.837
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -834,10 -832,10 +834,10 @@@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1
  F src/vdbevtab.c 2143db7db0ceed69b21422581f434baffc507a08d831565193a7a02882a1b6a7
  F src/vtab.c 4c475fb672a6fe57830561e614dbee21a9a24a6f616d1cfcbe85f356a09f14ad
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
 -F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 +F src/wal.c 2586d8f3503ed7a59cb3becb380bd90a5ca218c2d331d3d33e3bed58d26aa1ae
 +F src/wal.h 97b8a9903387401377b59507e86b93a148ef1ad4e5ce0f23659a12dcdce56af2
  F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
- F src/where.c 11a67988c3a5be2e7ee07c958998f3ad4b30dc491c0add894c2933c752415b16
+ F src/where.c 9982128f010a699560fb5be37633801c7641ac3540f49db43cec878025929a0e
  F src/whereInt.h 82a13766f13d1a53b05387c2e60726289ef26404bc7b9b1f7770204d97357fb8
  F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
  F src/whereexpr.c 7b64295f1d82ad0928df435925dd7bbd5997b44a026153113eace0d9e71ff435
@@@ -2197,8 -2184,9 +2198,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 c0af1242d86a85cf32d9fbaa614a097e77142e7ba89c3e3c1be74c0e9768126b 6a06dc73847716c88d65651d1bf0e002002303881df1389beac884d0032eae08
- R afe357c1fac622e922285fa52089a2ec
 -P c7896e88850669e18e89d44c4169d4f4a5d4b904bea6ccb2ac64f93b6d348a42
 -Q -a9657c87c53c19228a42559c82c54b504a5ad729e407e9e2c7dabcc0c949b261
 -R 00fdd25fa9a3c1e58bfe6d44fd3eb812
++P c2139d826355009e6fb30091734c388bdcb8cb0889f7225481c163850a3e71ff 4484ec6d26b31305e31de89bdbae26344d8083a7e7de20861430d31737d9979c
++R 7b2af39c9909f089633245ca0a9fd223
  U drh
- Z 3b4d0a9b2a7c6e06be97c12a40182e15
 -Z d45c3b35e63ad3a95f4d8ac3c99323f3
++Z 0628b7c1bde3a819cb83dcfd11eb8f84
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 34e3926842,0dad7c2062..b9a8225802
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c2139d826355009e6fb30091734c388bdcb8cb0889f7225481c163850a3e71ff
 -4484ec6d26b31305e31de89bdbae26344d8083a7e7de20861430d31737d9979c
++a8a8a2db9b879c543fb3fd25cf66717a3dfdf9857dcd1ab9a98b31fbc85dbfc9