From: drh <>
Date: Wed, 12 Feb 2025 18:22:36 +0000 (+0000)
Subject: Merge the latest trunk changes into the default-in-values branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9429b59b0b0b4bf667dae5cf2aaf7fdd6ea95dba;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the default-in-values branch.

FossilOrigin-Name: 480d7c1a1abb4b543bbc6ee37db82c5232c69d0abc2722c00e262e6c64c860ff
---

9429b59b0b0b4bf667dae5cf2aaf7fdd6ea95dba
diff --cc manifest
index ddc4ff9321,716b9c746b..87b8f1ef50
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C This\sis\san\sexperimental\schange\sto\sinvestigate\sthe\sfeasibility\sof\sallow\nDEFAULT\stokens\swithin\sVALUES\sclauses\sattached\sto\sINSERT\sstatements.\sThere\nis\sa\slot\sof\sextra\scode\sspace\sconsumed\sfor\ssuch\san\sobscure\sfeature.
- D 2025-02-06T21:14:27.053
 -C Remove\sold\sfunction\sdeclaration\saccidentally\sleft\sin\ssqlite3session.h.
 -D 2025-02-12T15:31:26.463
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sdefault-in-values\sbranch.
++D 2025-02-12T18:22:36.262
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -769,7 -768,7 +768,7 @@@ F src/os_win.c 49c7725b500f5867e8360e75
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 3a1c4e7f69af482e33c8cba8a75afe0dda0ea6391240adac22b040ce1bdeef44
  F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
- F src/parse.y 537ea5f4881e924db32e786fbfe2cc5d20990731d34c2101b0abd6a1315d7970
 -F src/parse.y f84673f1454e2bcf517623d4346e67fb2d73e57826ea103681ad5848238f6029
++F src/parse.y c3db7ead52bf0b0568eb840d37df5dd5b6c29ea7367d891cdd66b543c933c5c6
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@@ -2209,11 -2207,8 +2207,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 e93d7aa1db9bdbf1996c4c168e67284177e384b7acf176d74a0458258faab05c
- R d804befe9bc6b41a89ecf51824c5dd3c
- T *branch * default-in-values
- T *sym-default-in-values *
- T -sym-trunk *
 -P da94e551c0ed354ae782c89fd9495d607b77ad7572d90c41ceac12bd6ec4c31b
 -R 6f7f1710621940ea4683c778ed859375
 -U dan
 -Z 8c9d99e3c5ea71beb7debabd9d22f723
++P 2ff4129ea05c1cc5a0c58540c7de9cdd5831a808514d11ac5ba2d4a44ca20354 0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7
++R f75dcf997fa430b54d1f0e267a94a336
 +U drh
- Z 6c6a00c698a47380c071bb1637488a2a
++Z 13b0f60b307c4db5960dca9f95b5d27b
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8c7cc3302b,d19a148ee4..4ac1be53f1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2ff4129ea05c1cc5a0c58540c7de9cdd5831a808514d11ac5ba2d4a44ca20354
 -0cfbe349d4b740f3d2be8c714cf679901fc2465db4c64e4c3742da700d82f4e7
++480d7c1a1abb4b543bbc6ee37db82c5232c69d0abc2722c00e262e6c64c860ff