]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge trunk into column-text-blob-v2 branch. column-text-blob-v2
authorstephan <stephan@noemail.net>
Fri, 4 Jul 2025 10:17:25 +0000 (10:17 +0000)
committerstephan <stephan@noemail.net>
Fri, 4 Jul 2025 10:17:25 +0000 (10:17 +0000)
FossilOrigin-Name: f73460d4f04729d5d660812ac969e3e02be9d0e44741773b29828252f9927e63

1  2 
manifest
manifest.uuid

diff --cc manifest
index ce0458da6bfbdfb8f1b0cfd2bbc4fc062e7738a4,0bb98b5b83b84f2da464f7008b7d56935f5a06bd..41cbfc33811af95ddb4cb8263fdcf68ef36c7927
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Tweak\sfor\scoverage\stesting\sof\svalueToTextV2().\sThis\schanges\spasses\sthrough\scoverage\stesting\sbut\sdoesn't\slook\squite\sright\sto\sme,\sin\sthat\sthis\spart\snow\sdiffers\sfrom\sits\scounterpart\sin\svalueToText()\s(which\sdoesn't\sneed\sthis\sto\sget\scoverage\sfor\swhat\samounts\sto\sthe\ssame\spath).
- D 2025-07-04T10:10:32.331
 -C Fix\sa\sfew\scases\swhere\sLIMIT\sclauses\sthat\swere\spart\sof\sscalar\ssub-queries\son\svirtual\stables\swere\snot\sbeing\spassed\sto\sxBestIndex\smethods\scorrectly.
 -D 2025-07-03T16:05:41.252
++C Merge\strunk\sinto\scolumn-text-blob-v2\sbranch.
++D 2025-07-04T10:17:25.837
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -785,12 -785,12 +785,12 @@@ F src/printf.c 71b6d3a0093bf23f473e2548
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c d40fe18d7c2fd0339f5846ffcf7d6809866e380acdf14c76fb2af87e9fe13f64
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c 882d739e0d5e6c7a8b46a3cca3ada37fe1a56301f1360d6b141312c666bbe482
+ F src/select.c 700e98061a61bf8e8b0f2707ed22ffc44c7a7b660dbf7c569430e04d2f95d8a5
  F src/shell.c.in 4f14a1f5196b6006abc8e73cc8fd6c1a62cf940396f8ba909d6711f35f074bb6
 -F src/sqlite.h.in 5c54f2461a1ea529bab8499148a2b238e2d4bb571d59e8ea5322d0c190abb693
 +F src/sqlite.h.in 48eb0bbedff52af04d86b74127bb6d7939e460f3ddbc9040a7482848d2057f65
  F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
  F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
 -F src/sqliteInt.h 005542f8760edf9b62f014abccb876cf64533b64475a40a89402054d62535288
 +F src/sqliteInt.h 461d39b85ee97d8f1496388f5d6884e8a240cabaea26b915ac7fd59e7a2ef727
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -852,13 -852,13 +852,13 @@@ F src/upsert.c 215328c3f91623c520ec8672
  F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
  F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3
  F src/vacuum.c 1bacdd0a81d2b5dc1c508fbf0d938c89fa78dd8d5b46ec92686d44030d4f4789
- F src/vdbe.c 7e29623ca387880b8893e69135a0ff240c3dcaf0710f7a46a5f95b062cf93883
+ F src/vdbe.c d2c13c0001f5ec40ec1f010a7f9badcff3ce09bbd7a78528682ad49d8566df54
  F src/vdbe.h 93761ed7c6b8bc19524912fd9b9b587d41bf4f1d0ade650a00dadc10518d8958
  F src/vdbeInt.h 0bc581a9763be385e3af715e8c0a503ba8422c2b7074922faf4bb0d6ae31b15e
 -F src/vdbeapi.c f9a4881a9674fec3fa13da35044a1484d3c4b95f9ec891cc8ffb02ef2b7a41df
 +F src/vdbeapi.c 8e147b96e11a72079788ac01080812fb272cdb10e58e2c123099ddda99f8b818
  F src/vdbeaux.c fd2c6b19a8892c31a2adc719f156f313560f9cc490cdbd04ff08fdae5d7aedb7
  F src/vdbeblob.c b1b4032cac46b41e44b957c4d00aee9851f862dfd85ecb68116ba49884b03dfd
 -F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
 +F src/vdbemem.c 8b5582eaa99d51d5df69f2a4e27fb99369aa09a206b669088388f537e68f03c3
  F src/vdbesort.c cb6f472e83ca12c46aa7de0ac0a9d11458b357986f2617a1c90dfb19a542ecbe
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
@@@ -2208,8 -2208,9 +2208,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9226a2a3c60a0f11fec9dd66cfa89ad8e625e9f0507e8d66ba2a06caafd65a9c
- R e8c7784d52c251b6569aa6faf611973a
 -P 8b31acc0b18f38eb4af6efebd1ea25cd65a146651101579aee20afd9ec6dc2de 25131ee84f53dab1191e02c19cefd256aed2828c7edea325fcc0ba3b0a668583
 -R 03da53ec2c5bbfaf5954c2ff4dc81144
 -T +closed 25131ee84f53dab1191e02c19cefd256aed2828c7edea325fcc0ba3b0a668583
 -U dan
 -Z 169d778787b3864e08d84b0f7a4d552a
++P dae572912ff0e6acf14422caf5ceaab88878ee07eb9b3e9b2c8e878c36461707 960a8e6fc91f47add3a089dc6cef013109deadf809994c5149ad3bdfb3884de0
++R bfc373a0086b565d6ecc53f08895bc92
 +U stephan
- Z 4203b1a7fb61abf75921bdc2a0618086
++Z fb2b2ec7514f2df239cf4666c452788d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 28a6bc2208bb694c206c53f0fbe5b68a282a296b,5e9ea7fa4ac2dd7d8ea964574eb659e4d6b540ee..5f7ab4cc3cfa52261a66200a09df2814f8effddd
@@@ -1,1 -1,1 +1,1 @@@
- dae572912ff0e6acf14422caf5ceaab88878ee07eb9b3e9b2c8e878c36461707
 -960a8e6fc91f47add3a089dc6cef013109deadf809994c5149ad3bdfb3884de0
++f73460d4f04729d5d660812ac969e3e02be9d0e44741773b29828252f9927e63