From: drh <>
Date: Fri, 10 Apr 2026 18:53:13 +0000 (+0000)
Subject: Merge trunk fixes and enhancements into the cli-prompt-redo branch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49998a6d25a300f442d6649400a499e06a5fff26;p=thirdparty%2Fsqlite.git

Merge trunk fixes and enhancements into the cli-prompt-redo branch

FossilOrigin-Name: f3354ebf51e684ef680986bef9b606f63786c254f1c8774bcaf7a7f3d0d37056
---

49998a6d25a300f442d6649400a499e06a5fff26
diff --cc manifest
index 1af3a09a0f,84804b900a..b46c2bb893
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Prototype\ssqlite3_incomplete()\s-\sa\svariant\sof\ssqlite3_complete()\sthat\sreturns\nadditional\sinformation\sabout\swhat\sis\sneeded\sto\scomplete\sthe\sstatement.
- D 2026-04-10T13:43:48.738
 -C Improve\sdefenses\sin\sQRF\sagainst\strying\sto\srun\sthe\ssame\sprepared\sstatement\ntwice,\sconcurrently.
 -D 2026-04-10T18:14:33.530
++C Merge\strunk\sfixes\sand\senhancements\sinto\sthe\scli-prompt-redo\sbranch
++D 2026-04-10T18:53:13.643
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -735,8 -735,8 +735,8 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
- F src/shell.c.in 2bbbb04153354fe3d11677d69ce7b6d5bfe8113e2d3693791915590eaa4f1bce
 -F src/shell.c.in 4d00b373ce9485b5f2db2dbebf3a6a3ef3ebe7b77fc7ecb3278cae2cb4a5529b
 -F src/sqlite.h.in e2915e4a86d5e0783afb5cb72411df38d987c7f3c5aa2d5441b8e74d30b649d8
++F src/shell.c.in e4093ccf2a9189ec34db7a34f011c6ecb9ec3721981526eb214bdf08ac2a590e
 +F src/sqlite.h.in a5605faa9479bbaac16c4ab43eb09ff50632004a8e05084d3fde56063ef73766
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
  F src/sqliteInt.h bc1cbc0c23dba35b324ae85a7dbb5fb182321bbd30857fb21f3d0cba049001a5
@@@ -2197,8 -2197,8 +2197,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P bbee56f970ade40734c8a278f46d8a268b305fe349c3739c977fa9141d2c3b6a
- R 12cd07af606e611ea7f41e67ab10d130
 -P 749c537812b907164b7e7ad1fddc1aee8106c59875d2686fe83d602cd0e07611
 -R dcd0777a578b9e7fcae4e40b79f9e2d6
++P a698fbfb8bb256ee0d9802c01562c11492ca2800a45360b268ac6cf397a7fad7 6ab6f622be3e1ad93166d139b5fccf9628c86d1c14c6dfb4464cb8cf52c94785
++R 4d2bbb27b149398ceae03cca09977cdc
  U drh
- Z 547b407658ddec4e488d7004be7d0be4
 -Z 7fb5863e4e0e9a753db98e9b8a77917c
++Z 0e5a6f70160f3c705711d8f141e5cb21
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4c993035c5,d8e14ca9d7..8ccff5afc7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a698fbfb8bb256ee0d9802c01562c11492ca2800a45360b268ac6cf397a7fad7
 -6ab6f622be3e1ad93166d139b5fccf9628c86d1c14c6dfb4464cb8cf52c94785
++f3354ebf51e684ef680986bef9b606f63786c254f1c8774bcaf7a7f3d0d37056