From: drh <> Date: Fri, 14 Nov 2025 20:11:15 +0000 (+0000) Subject: Merge the latest trunk enhancements into the qrf branch. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a3561e2d99b2a0afc2d73b24860449ec0fa30ec;p=thirdparty%2Fsqlite.git Merge the latest trunk enhancements into the qrf branch. FossilOrigin-Name: 9ee892b4f97c91208a658f09add00a567406e913edb022a2fd53333ea01c2b26 --- 9a3561e2d99b2a0afc2d73b24860449ec0fa30ec diff --cc manifest index 6bea940199,6253b8f82e..a51469a578 --- a/manifest +++ b/manifest @@@ -1,14 -1,14 +1,14 @@@ - C Fix\sharmless\sdisplay\sbug\sin\sprevious\scheck-in.\s\sAdd\sthe\s-noinit\scommand-line\noption\sto\sbypass\sreading\sthe\s~/.sqliterc\sfile. - D 2025-11-14T19:04:23.019 -C New\sinterfaces\ssqlite3_str_truncate()\sand\ssqlite3_str_free().\s\sVersion\snumber\nincreases\sto\s3.52.0. -D 2025-11-14T20:09:01.581 ++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sqrf\sbranch. ++D 2025-11-14T20:11:15.522 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md 6bc480fc673fb4acbc4094e77edb326267dd460162d7723c7f30bee2d3d9e97d F Makefile.in 3ce07126d7e87c7464301482e161fdae6a51d0a2aa06b200b8f0000ef4d6163b F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc 523bab2f6569e912a0aaf2d13e0b3f9bcb36d52310b236d950b354068c9de3f3 +F Makefile.msc 8c5ed7173ee4cc3c03ba8e21065128f7ca5292c83d68f3bf971786e21fc6e382 F README.md dae499194b75deed76a13a4a83c82493f2530331882d7dfe5754d63287d3f8f7 - F VERSION 16eddb43056a79c1977427ab7a05f3457c373fa159dcdced8754eb89ce7e06b8 + F VERSION 74672bfd4c7826c0fc6f84762488a707c52e7d2d94af42ccb0edcc6c74311c41 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d87031 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@@ -735,10 -732,10 +735,10 @@@ F src/random.c 606b00941a1d7dd09c381d32 F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a -F src/shell.c.in ceb0a9cc008ac82d8d2e6ef353db14a54bc40dfd60a8cfbb6bc98d071f538761 +F src/shell.c.in 036a035b7338d2b2a487ed8bc5704fe328730ff0e69fd2ad7eddac433ccb0fd1 - F src/sqlite.h.in 684c19c3b093cca7a38e3f6405d067777464285f17a58a78f7f89d6763e011e7 + F src/sqlite.h.in 795ce84cc136b4e74d882cf4fab56d2927c20b9af9fd2fcea27760a6fe50851b F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 - F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52 + F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998 F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59aa F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364 F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592 @@@ -2175,8 -2167,8 +2175,8 @@@ F tool/version-info.c 33d0390ef484b3b1c F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 9daf98c2f449688b7463b71dfa926cb4ae96d8c7ee34946df2172bb37f7c5616 - R e360db8c5b351166499414f2456224e9 -P e2b3f1a9480a9be3e06c2d79abcf39f399b5adf2ca882841b3b3fa199c239dd8 -R 6043f56030d0e963047ce8d91569011f ++P 229650a01dcd9cc4b39526d661106e9c3eb2f90ca7fbed8adc6e6fe85ef3fdaa fa85534ed927851dc37a4943e83259bff4509f141449226ffb506f9acc7b2cc5 ++R 345c49aeb99e16774f28cf8e0c1a004d U drh - Z 01ee205d237f871f1acf344f0ffb9d23 -Z b8c9a9d7f16424a3eac34fa0ef45da66 ++Z ce60499ced798382b41544ef3cdae0bc # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index db3c24f143,64a8750582..53869e2565 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 229650a01dcd9cc4b39526d661106e9c3eb2f90ca7fbed8adc6e6fe85ef3fdaa -fa85534ed927851dc37a4943e83259bff4509f141449226ffb506f9acc7b2cc5 ++9ee892b4f97c91208a658f09add00a567406e913edb022a2fd53333ea01c2b26