From: drh <> Date: Thu, 27 Mar 2025 23:29:25 +0000 (+0000) Subject: Merge cygwin and tclsqlite fixes into trunk. X-Git-Tag: major-release~149 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=257e026de93e91ae762f867bd36235ca6762f550;p=thirdparty%2Fsqlite.git Merge cygwin and tclsqlite fixes into trunk. FossilOrigin-Name: 121f4d97f9a855131859d342bc2ade5f8c34ba7732029ae156d02cec7cb6dd85 --- 257e026de93e91ae762f867bd36235ca6762f550 diff --cc manifest index b4ac8938d2,837497bcdf,2a6777c190..f1922909d9 --- a/manifest +++ b/manifest @@@@ -1,5 -1,6 -1,5 +1,6 @@@@ - C Rearrange\s#includes\sin\sFTS3\sto\savoid\sa\sharmless\scompiler\swarning. - D 2025-03-27T18:22:11.592 - C Add\san\sexplicit\sdb\sclose\sto\sfix\sa\sfile-is-opened\sfailure\sin\ssession1.test\sin\scygwin. - D 2025-03-27T18:42:51.747 -C Fix\sfor\sforum-post\s[/forum/forumpost/b5fde3596c|b5fde3596c].\sAlso\sfix\sencoding\sissue\sfor\snon-ASCII\scharacters.\nAlso\sincludes\sa\sfix\sfrom\sStephan\sBeal,\sabout\sa\smissing\s\sinclude. -D 2025-03-27T17:30:49.432 +++C Merge\scygwin\sand\stclsqlite\sfixes\sinto\strunk. +++D 2025-03-27T23:29:25.564 + +F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@@@ -793,29 -794,29 -793,29 +794,29 @@@@ F src/sqliteInt.h 96133c5b4371629b30644 F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 - F src/tclsqlite.c 254e69d6b4bc185ca2a3b186a92bda186aec9038063ebb9247b9b3181d4b4d4f - F src/tclsqlite.c 5875b959c3262d93b32893540c40d4ebb111495adc80db3ee0ddd440966ddcd5 ++ F src/tclsqlite.c 767a11d470b031e85f51b8924a0e8929b2362ff1975aee3474a10eba3c2e0d36 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395 - -F src/test1.c ba7b93478a6a7a3f48ec5507f28bc662636ac5d9f9791700d3648a8e788f0bb2 - -F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3 - -F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b - -F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d - -F src/test5.c bb87279ed12e199486894e6c83e58dc8cd1de9524ace171d59219d3ab696a0c1 - -F src/test6.c 763b92489f11f4a77b773f0d3b8369ab0edd5292ac794043062c337019f12d8a + +F src/test1.c e89a11192dd15da20e8f7dc0731297182b2fff56cf4afe6ca6f9aeab890595c5 + +F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff + +F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a + +F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0 + +F src/test5.c 38fa635a70a94f2aa8b47ecbab15d821386205d27ad4159c3551ab3ba45efa11 + +F src/test6.c 9722054d37257459f1b8988e59e7db1dd630bfb291f16b2759764e778a9d1899 F src/test8.c 206d8f3cc73950d252906656e2646b5de0d580b07187b635fcb3edd8c2c5fbc0 - -F src/test9.c 7a708ad27f8fda79113e5e15de66632710958c401e64c2f22bc04e2f5a7a1b62 + +F src/test9.c df9ddc7db6ef1b8cf745866ee229090779728bcbe660c7f297d3127ab21d92af F src/test_autoext.c 14d4bbd3d0bd1eec0f6d16b29e28cf1e2d0b020d454835f0721a5f68121ac10f - -F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d9719a7 + +F src/test_backup.c a2bfd90d2ff2511b8635507bdb30fa9b605ade19c16b533066cae3077f5bdb72 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6 - -F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5 + +F src/test_blob.c 77b994e17f2c87055f44fd96c9a206c5a7155bae2cda2769af60c2f3582f962c F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5 F src/test_config.c 7f412406592794636d6226268e26d413850a9f799bc5f3c01afc2820b165fca8 - -F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f + +F src/test_delete.c d0e8f6dc55cfc98a7c27c057fb88d512260564bf0b611482656c68b8f7f401ed F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86 - -F src/test_fs.c c411c40baba679536fc34e2679349f59d8225570aed3488b5b3ef1908525a3d5 + +F src/test_fs.c 6711fd4c6c05914b613cfc99918a24978452f999ce03fc8f89c9794c03b20a5b F src/test_func.c 858d4dddb7acf88222ebcba7cffb585f6dde83e4a15b838c0d05ccdf8d5219b9 - -F src/test_hexio.c 7449504e4bde876ba91b202617a9228c7c8c2e7bd8b957302f3803ac0e9e353c - -F src/test_init.c 17313332d58e90defc527129d5eda4a08bd6b6e8de7207a231523c8d98fb445e + +F src/test_hexio.c a90baa0a8ab5e7cfe2216a61c9a31cfd1f8378353a3d23e25fa94c09aa755bb0 + +F src/test_init.c 1649e02448f536e53172f6b1ff873254fe9a0c6c8a4502a2d25c0cc7b11945ea F src/test_intarray.c 3fcf8ca7bb5c8776ea83f6aa9b66f8df0d1f37a99207b0097c8486f9c15cedbf F src/test_intarray.h 6c3534641108cd1bea517a8e117dcba237081310a29a4c35bd2190caa8972293 F src/test_journal.c a0b9709b2f12b1ec819eea8a1176f283bca6d688a6d4a502bd6fd79786f4e287 @@@@ -2215,8 -2216,8 -2215,11 +2216,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 2345094e879c5538bfea005785ce0848e6d565a49bcb48b323c258d00ccbe9b8 - R ccf07cdc083a3826c0a733863a0e36ee - P 99fdd19193056259d84768f46519328c300976b102f1b1e0b815720df01b28d0 - R 0e7cf04d0b98fc57a6a54399d55f0abd - U stephan - Z 8501b14f4f0f61714b2ced1b79f0fe62 -R 4ff975de44798fc382336120e7cd3853 -T *branch * tclsqlite-db-copy-fix -T *sym-tclsqlite-db-copy-fix * -T -sym-trunk * -U jan.nijtmans -Z b45977ee1b24660b9e02a9cdf40f95f6 +++P c5206cee83a4f1e59bfceda35cdfa528f9b4611eaf306da863ae83e9f93cdeb7 c6e4e1cf2b70d2e603ea3faabd9cb5fbd9f5497672574283ace8c62984dfbb97 e60198001e12f85a5d6504ce72226dfceb8666fe5ec649237fa23ae20e8aa32d +++R d6dc8c3c7bf9724429b6bef84640ccd0 ++U drh - Z d89839ab3f248b73bf98271a00e9f15f +++Z 9fba388b00eb19a7b9fc8b81e9cc02c7 # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index 13c9ddf1b0,44ff91e1ef,99163b718a..583806bacb --- a/manifest.uuid +++ b/manifest.uuid @@@@ -1,1 -1,1 -1,1 +1,1 @@@@ - c5206cee83a4f1e59bfceda35cdfa528f9b4611eaf306da863ae83e9f93cdeb7 - c6e4e1cf2b70d2e603ea3faabd9cb5fbd9f5497672574283ace8c62984dfbb97 -e60198001e12f85a5d6504ce72226dfceb8666fe5ec649237fa23ae20e8aa32d +++121f4d97f9a855131859d342bc2ade5f8c34ba7732029ae156d02cec7cb6dd85