]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge all recent trunk enhancements into the reuse-schema branch.
authordrh <>
Tue, 26 Mar 2024 10:48:32 +0000 (10:48 +0000)
committerdrh <>
Tue, 26 Mar 2024 10:48:32 +0000 (10:48 +0000)
FossilOrigin-Name: e469b02205a4f3923c93ec9c4825045aba1cc9e053d6e341efaa850993bc155e

14 files changed:
1  2 
manifest
manifest.uuid
src/build.c
src/main.c
src/pragma.c
src/shell.c.in
src/sqlite.h.in
src/sqliteInt.h
src/test_config.c
src/vdbe.c
src/vtab.c
src/where.c
test/testrunner.tcl
test/testrunner_data.tcl

diff --cc manifest
index 1b80bd05c612c7caf354888734663221cb0afeda,24f7bb9fb9662ab0aeb1b93f78e4cd711a721df0..cdaaa36873ecc51858166b70d64563b98d9d9aea
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2024-03-18T18:56:10.107
 -C The\sRAISE()\soperator\sis\snot\sa\sconstant\sexpression\sand\scannot\sparticipate\sin\nthe\sVALUE-as-coroutine\soptimization.\ndbsqlfuzz\s74cf7c9904360322a6c917e4934b127543d1cd51
 -D 2024-03-25T20:35:14.251
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
++D 2024-03-26T10:48:32.013
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -616,8 -615,8 +616,8 @@@ F ext/wasm/api/sqlite3-vfs-helper.c-pp.
  F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 5a430874906ff3f4a6ca69aadf0c2aaedc1bb45489b8365bff7e955a83a8d42a
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 3c72f1a0e6a7343c8c882d29d01bb440f10be12c844651605b486e76f3d6cc8c
  F ext/wasm/api/sqlite3-vtab-helper.c-pp.js a2fcbc3fecdd0eea229283584ebc122f29d98194083675dbe5cb2cf3a17fe309
- F ext/wasm/api/sqlite3-wasm.c d33a16495ca871781e78812d3a18fed78b797468fffee657b8d7199b277ff359
+ F ext/wasm/api/sqlite3-wasm.c afba6827a49151b564af5cf588a6bbd0401b16ef5cbe3269c66f676fee9ca92c
 -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bd89edfe42a4d7122a6d6d405c5423cf00aabba1f76f6ea8e2dba9c628ddd91a
 +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js c5ac33e39f21a3481812d7333ca6e18853640d423a01960ca8dbc6e7c5c3c21c
  F ext/wasm/api/sqlite3-worker1.c-pp.js 5e8706c2c4af2a57fbcdc02f4e7ef79869971bc21bb8ede777687786ce1c92d5
  F ext/wasm/batch-runner-sahpool.html e9a38fdeb36a13eac7b50241dfe7ae066fe3f51f5c0b0151e7baee5fce0d07a7
  F ext/wasm/batch-runner-sahpool.js 54a3ac228e6c4703fe72fb65c897e19156263a51fe9b7e21d2834a45e876aabd
@@@ -693,10 -692,10 +693,10 @@@ F src/btmutex.c 79a43670447eacc651519a4
  F src/btree.c 285b493d843e7ba8ef78b6ae7d31238e904901dbc0c484f7904de4cf18fd8802
  F src/btree.h 55066f513eb095db935169dab1dc2f7c7a747ef223c533f5d4ad4dfed346cbd0
  F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b6
- F src/build.c 289d51f984aebc228dcf2d46bc538099f1b0a044ae3218cdb6ba5a14cf86dc57
 -F src/build.c 02f5b25ca854c83b5015cb02b8c9ab236c60b1795528675aee8a5070e58da52a
 -F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
++F src/build.c 369d1bfb46f26de8a3687ed18abb347e5b171d79d0a737769463eee264b4b4c8
 +F src/callback.c fbd4e8247f1a7f37aec721bde0e312e79cc3bfa41f55a59930bc876ca6baf455
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
+ F src/ctime.c 64e4b1227b4ed123146f0aa2989131d1fbd9b927b11e80c9d58c6a68f9cd5ce3
  F src/date.c 126ba2ab10aeb2e7ba6e089b5f07b747c0625b8287f78b60da346eda8d23c875
  F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
  F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
@@@ -714,7 -713,7 +714,7 @@@ F src/insert.c bc4d172b52a6167cd2879739
  F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
- F src/main.c 93593ecad08c1b73a3f5d5d9ae6e81c297853fdc198fb947cd7c66bfe7e40786
 -F src/main.c 8a59d297ec77e6b78550433bfccb95a1b26f2fb69aaaf233206e21579a1cfcc1
++F src/main.c 2f08f8af689c35ff532e3625d8185e413e9eced110ccea7602c98b3eef3c2184
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -744,23 -743,23 +744,23 @@@ F src/parse.y 5bcef16094213efcc365a9d4d
  F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
- F src/pragma.c e921676f6c29502c681b53d0c5d609a8780eaeeddbaa76459aa7607efc6a2760
 -F src/pragma.c f8f1845b42df684e9d31c5a1628c989a34939686049d7878bc5394ac1ae9cac4
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 -F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
++F src/pragma.c 6eb7e2f78d66bf78bb4b3ccd0f5b26acc15bc69066e04938e61737ced91f10b9
 +F src/pragma.h 50f6d3b408ed56bde4f4e4aead8c0b2022030b692e8de237c1b7a0b5ce87a0c8
 +F src/prepare.c 9fe59f2cf0b75554982ffe906c83ebe478354b6d981ed0c143cc9f2f58c9210a
  F src/printf.c 87b67bba3662a0523f39ae6b084a3907109702f717c654d6cecb838af5cd57f1
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c ef87e3bc7700bfe761a7bbee2ce6084f1766dc816dd82a3ae77c133eec898432
+ F src/resolve.c eb1860b134fb044fd819c4347105c148d5aac7c6498032be2829e5cc95619b28
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c df2bf515fc36e02e97959a70e82da8a4967d6c85590646a7fda2926a734c81ce
- F src/shell.c.in 736d540ed0704e567767c712e1c1c6a3e2f87bb8b7bc9020febb121ee2f70abe
- F src/sqlite.h.in 1e317e1d0a17becd7ad9d1d30f2a248d78440d3ca2befead0e747043ebb1989a
+ F src/select.c 15a221347789e393b39e7d2d2bd102167979c95a1ce0675bb870b86a24ca6cf4
 -F src/shell.c.in 0354ca51eee5fbf6af394a7ef9f5ef6823ef45b743db65431f6777e4d5be2199
 -F src/sqlite.h.in e9af5761aab316d52e5a5ac11b42d6a25eaaa49352e982c14f1080aab684b5c4
++F src/shell.c.in 95d92c0162bcfea8a9d9610acbd8a0a861c5e24c15272c957acbe4f39382ddae
++F src/sqlite.h.in f0f8f0d2a73dd926f41e38bd44fcfac313a40f91373eced4f96333c6c2d4bec3
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h c472e384c0d70a352ce7239a29a799b93ee6d8bc385bbf0be7e8afcbc525b131
 -F src/sqliteInt.h f8928f0397d797046396dd9d360a6af8ce6dcb48bd72ea290165b07c8c518744
++F src/sqliteInt.h 13c2178e80eb068397dffe6ae659cbc95af34ee69ceeeca0ad709615796db471
  F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 -F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 +F src/status.c 5028a0afee355aa492f26f0b6a3ec23145caa9261a93164d96cd0b9bf1b2318f
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c ecbc3c99c0d0c3ed122a913f143026c26d38d57f33e06bb71185dd5c1efe37cd
 +F src/tclsqlite.c df375d63a3b0f06e79f29b6876c228c8896599497d6f54adbcd12d7d71b3162d
  F src/test1.c 310f43eb17a9252a7790726ca652e4ea3197da17c19eec93b8578863a49dc7b4
  F src/test2.c 54520d0565ef2b9bf0f8f1dcac43dc4d06baf4ffe13d10905f8d8c3ad3e4b9ab
  F src/test3.c e5178558c41ff53236ae0271e9acb3d6885a94981d2eb939536ee6474598840e
@@@ -775,7 -774,7 +775,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c f6af1e41cb7901edafb065a8198e4a0192dd42432b642d038965be5e628dec12
  F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c f8353821fbdc038bd080b5b125be365001ed3d9027d6410d0e40b4842e721778
 -F src/test_config.c 5fa77ee6064ba546e144c4fea870c5ede2c54314616f81485c6a9c4192100c75
++F src/test_config.c 7f2b70b7259fb9f6418a6d266a035acf24842e3528745a2bed4dd252bddf1a32
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c 38a459d1c78fd9afa770445b224c485e079018d6ac07332ff9bd07b54d2b8ce9
  F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
@@@ -820,24 -818,24 +820,24 @@@ F src/trigger.c fce5a48596e30c9517357f5
  F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
  F src/upsert.c 2e60567a0e9e8520c18671b30712a88dc73534474304af94f32bb5f3ef65ac65
  F src/utf.c f23165685a67b4caf8ec08fb274cb3f319103decfb2a980b7cfd55d18dfa855e
- F src/util.c f27a17e6e43fa362abea4db507a1c409f0adc8048ecf4c6479e8d162158ed529
+ F src/util.c 4d6d7ebfe6772a1b950c97bbb1d1a72ad4874617ec498ab8aa73b7f5a43e44bb
 -F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c 651aa0f31027d5d0a133eb7b41d11c41dc3b88ecb760b770430da0e477ae3b6c
 -F src/vdbe.h c2d78d15112c3fc5ab87f5e8e0b75d2db1c624409de2e858c3d1aafb1650bb4f
 +F src/vacuum.c 5bc892883611a65ca75b4129bcf5cf8b0908564b357373fdeee364d3b1af7cd7
- F src/vdbe.c 9ec10717109354aaf52d779ee09e1860a9ea7e1756fcc6561ee7a69e52b6e688
++F src/vdbe.c 6aa0fe7d554f212786b6b4940b371fee1d444e918b287497416904700d935708
 +F src/vdbe.h fe29af5e25afab09947201d417d2ca7b7bbca4a58bf80f3f40b7d6bb4ae33245
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
- F src/vdbeapi.c 8f57d60c89da0b60e6d4e272358c511f6bae4e24330bdb11f8b42f986d1bf21b
+ F src/vdbeapi.c 80235ac380e9467fec1cb0883354d841f2a771976e766995f7e0c77f845406df
 -F src/vdbeaux.c 6385727adf51a649e4993098870a62c3945fe21dbc0e0fd9013772aff930b8fb
 -F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
 +F src/vdbeaux.c 1222d1b7834fa4b1dd04b84fa9dd6fc226c17bb1487ecf44cb1a95d30e9e27c8
 +F src/vdbeblob.c 968d66a7dbeeb4036997db8bc02162429de0f068846759b781bc30e7345f864a
  F src/vdbemem.c 213bf303826c0ef702e3a2a69dab2309d84b8381b822c6787885859fd7cd4c4e
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c 2143db7db0ceed69b21422581f434baffc507a08d831565193a7a02882a1b6a7
- F src/vtab.c f0ff40a7d1bb182b6c2987ddb33ba611cf7a5e1bd35313c04dd0f5df9fc78970
 -F src/vtab.c 4c475fb672a6fe57830561e614dbee21a9a24a6f616d1cfcbe85f356a09f14ad
++F src/vtab.c 62e64e8b0becdda47b447e0946bb9b086dccd001b24d137e463c2820b1eed6eb
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
- F src/where.c a34a0eeb04a6c5916b576752dfdca8947c46d2463a2c9805919c8d781b3bdd1f
 -F src/where.c 11a67988c3a5be2e7ee07c958998f3ad4b30dc491c0add894c2933c752415b16
++F src/where.c 203c385e42ac53642bf54c7a5d99d289fa4e0b2fef2763f6365656a6dfaf551d
  F src/whereInt.h 82a13766f13d1a53b05387c2e60726289ef26404bc7b9b1f7770204d97357fb8
  F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
  F src/whereexpr.c 7b64295f1d82ad0928df435925dd7bbd5997b44a026153113eace0d9e71ff435
@@@ -1528,15 -1529,8 +1531,15 @@@ F test/regexp2.test 55ed41da802b0e284ac
  F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
  F test/resetdb.test 54c06f18bc832ac6d6319e5ab23d5c8dd49fdbeec7c696d791682a8006bd5fc3
  F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
- F test/returning1.test db532cde29d6aebbc48c6ddc3149b30476f8e69ca7a2c4b53986c7635e6fd8ec
+ F test/returning1.test 3ead782eddf51f573cdd43bcbb10d1b485ac095a19a76d16c43fd159ea9b7466
  F test/returningfault.test ae4c4b5e8745813287a359d9ccdb9d5c883c2e68afb18fb0767937d5de5692a4
 +F test/reuse1.test faa2ce5ff566d936b8a10d9e22ba2ee66a54ce89fdcf8aef561df6b15b0ff3d3
 +F test/reuse2.test 025d54dcbf5bb32a869ffde4884789af2ec4a302b7dc4550dfbd16e635a3dd65
 +F test/reuse3.test fa1edd6a303bbb93aa076d6579fce9d2ee2d9e1a8f4d7b613ac20a76ba622eaa
 +F test/reuse4.test adaad66253aea6cc748674328abe69b650c5c78b8676ed1162d3de09742519f9
 +F test/reuse5.test bbe6cf7384ef90f134392edd93d626385ef0bf6f40eefc3d993535cd0861d83b
 +F test/reuse6.test f4674f9967aee2a0b49c02832120b8b495291c0d87aae084c54e6c0cc18132fe
 +F test/reusefault.test ef646a0fb51d50ddfb4b7cd872f88e7d36eaba64bde7797b3418c3774e1c8d14
  F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
  F test/rollback2.test 3f3a4e20401825017df7e7671e9f31b6de5fae5620c2b9b49917f52f8c160a8f
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
@@@ -1695,9 -1689,9 +1698,9 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 -F test/tester.tcl fe617b88c7eb08bdf983d2aaa31c20fbf439eee7b8e0d61ca636fcd0c305bbbf
 -F test/testrunner.tcl b48a8fc17e3b200244f53d60348afa7fe9482400d164e95709890743af9536d0
 -F test/testrunner_data.tcl 3d36660cfd55ea5e20e661e8f94c0520feebcb437848f9b98b33c483cc479c0c
 +F test/tester.tcl ad2bf61b6676442e106c147f6d8b3735a61478f7c6ee9916178139efafc39232
- F test/testrunner.tcl 125d68bba59070d73cb4b0a8a17bbff414ee1f8081eafb84fa903d274e0bdbb7
- F test/testrunner_data.tcl 140b7201874bb2c98ed413f2c7f7beb069a6ef7b5fa619e9b458e20822f09110
++F test/testrunner.tcl e954baa96106c06ff7167a2efb4641315c33b438effa6f6b1e50e58674c853b5
++F test/testrunner_data.tcl dc79063e1705641ba781931e3ea9a2680e12062f7ab927dce716069c848c75bb
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -2189,8 -2183,8 +2193,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 693b8f9307fc9d3e00f2a573329f054709ad916a570773c986d32524b4d7522e 76fb3a908f45230b956cb659c754e47603e80aa72a2aad50d479437a9c013f61
- R aa84582729c32dbdf9ff004281703344
 -P f3c4433f6b33087494c8d38ff9dbb008a1bd30b424ca9aaa51c1956d75a86249
 -R 11afa0c0cb35ff6b57f28ca49a3f27d4
++P c2d4adabb929b6088808b05a2f031d045eb4839b44548a66006dc21e358e71f4 6a06dc73847716c88d65651d1bf0e002002303881df1389beac884d0032eae08
++R 3b0652db047bafda6f9442911e1fb947
  U drh
- Z 1460fe2e76c9e3a0dadc727534aebd41
 -Z 38f01fde0dacda37a79ba00b3f8d1e29
++Z 2f230d22a67b67fa1a728aa4b3497b01
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1d4aeeeecfa09f83270c2f0329cc96f15bdfb182,04e087afeb348223ca0dfe345f68e4b3e926145d..375c1e5a17579ff026ee5c7e82af8d43e5f58409
@@@ -1,1 -1,1 +1,1 @@@
- c2d4adabb929b6088808b05a2f031d045eb4839b44548a66006dc21e358e71f4
 -6a06dc73847716c88d65651d1bf0e002002303881df1389beac884d0032eae08
++e469b02205a4f3923c93ec9c4825045aba1cc9e053d6e341efaa850993bc155e
diff --cc src/build.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/pragma.c
Simple merge
diff --cc src/shell.c.in
Simple merge
diff --cc src/sqlite.h.in
Simple merge
diff --cc src/sqliteInt.h
Simple merge
Simple merge
diff --cc src/vdbe.c
Simple merge
diff --cc src/vtab.c
Simple merge
diff --cc src/where.c
Simple merge
Simple merge
Simple merge