Merge the latest trunk enhancements into the reuse-schema branch.

FossilOrigin-Name: 00d021eda4694ba5149fcec1f6563317f87b59c70a779ea6325b2620dd7bf51c

diff --cc main.mk
Simple merge

diff --cc manifest
index 120100035910115f76cfd0bc1b2dc7aa30e1a0f3,6aeda5c46fbf138bed4b56f2cea0c4fe16860a91..be8dcf7b87357b19704f5777d0784d9560ef5110
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\sthe\sreadonly-ignore-wal-jrnl\senhancement\sinto\sthe\sreuse-schema\sbranch,\nso\sthat\sit\scan\sbe\sfound\sthere\sin\sall\sfuture\sreleases.\s\sOther\srecent\strunk\nenhancements\sare\salso\spart\sof\sthat\schange\sand\sare\smerged\sas\swell.
- D 2024-11-01T09:50:26.266
 -C Remove\sthe\s.POSIX\sentries\sfrom\sthe\smakefiles\sbecause\sthey\scause\sportability\sproblems\srather\sthan\ssolve\sthem.
 -D 2024-11-18T14:15:08.975
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
++D 2024-11-18T15:51:41.232
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
- F Makefile.in c938c6f4febb0c5d63870bf9f6f8c43e5b20f3e1cfc889460d340add94d40db3
+ F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
+ F Makefile.in c3a01e98bd2ae6a4631df02f11249ac07ffa3d540d3034e2675f66cc259f2ea7
  F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
 -F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312
 +F Makefile.msc 382cbcfd8470f07eb722a5ed3d82e4a4b7292f23c2e09a52b65b23d38231d969
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -668,10 -666,10 +667,10 @@@ F ext/wasm/demo-worker1.html 2c178c1890
  F ext/wasm/demo-worker1.js 836bece8615b17b1b572584f7b15912236a5947fe8c68b98d2737d7e287447ef
  F ext/wasm/dist.make 653e212c1e84aa3be168d62a10616ccea45ee9585b0192745d2706707a5248ce
  F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f
- F ext/wasm/fiddle.make ec2353f0eddade864f67b993376a0949e27b72465c24b1970940e48b70bc2df1
+ F ext/wasm/fiddle.make d4969f0322a582c57a22ce3541f10a5b09a609d14eab32891f613f43b3c14d8b
  F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce
 +F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
  F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1
 -F ext/wasm/fiddle/index.html c79b1741cbeba78f88af0a84cf5ec7de87a909a6a8d10a369b1f4824c66c2088
  F ext/wasm/index-dist.html 564b5ec5669676482c5a25dea9e721d8eafed426ecb155f93d29aeff8507511f
  F ext/wasm/index.html e4bbffdb3d40eff12b3f9c7abedef91787e2935620b7f8d40f2c774b80ad8fa9
  F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
@@@ -698,7 -696,7 +697,7 @@@ F ext/wasm/tests/opfs/concurrency/test.
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
  F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 9622a287c30ed269c0443fd3ccbf42ee9122ddea0113b792862ce61ca58329c7
 -F main.mk c4e37e3015f9c2d8fd20fa3071ba86e7396959c8d5960e37e95aa85421e2b739
++F main.mk b43092a8a00f2ed91ce888d6e7c2e643135f67ffd79d746089abc2a4ed8d4574
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@@ -707,11 -705,10 +706,10 @@@ F mptest/mptest.c aa41ace6dbc5050d76b02
  F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc
- F sqlite3.pc.in 2d5c88643679fc199dafc9afb6ea8868ea3192d941c2e57dbe06395149d892ba
- F sqlite_cfg.h.in be1d075cf77134d53fdf5cc2c0919842e7e02a648c66a56e735af25ccdcaff91
+ F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03
 -F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532
 -F src/analyze.c 9a8b67239d899ac12289db5db3f5bfe7f7a0ad1277f80f87ead1d048085876eb
 -F src/attach.c f35bb8cc1fcdde8f6815a7ef09ae413bcac71821d530796800ba24b3c7da1e80
 +F src/alter.c 2da1deedaeb736237b8a73a59e06428df0bda1a763520ecd9e76eb2824b2ce46
 +F src/analyze.c d898233cbff9da0b22b0eba75c78527a71a95e00361a7a49efc338b28e1d20c2
 +F src/attach.c da15336ec4d0f4a246815bd092b4b6c78e4e9c57faf9865e310c567f42dde1d0
  F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
@@@ -740,7 -737,7 +738,7 @@@ F src/insert.c f8d1a0f8ee258411009c6b7f
  F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
- F src/main.c cd6faca7df7c23f5228bd61bef521704b6acf3fbba7dc742ae432de6d4d7e9ab
 -F src/main.c 9f4286302727f58fddc03a820d24cb7618a1e27473501792fbe979726f846d1f
++F src/main.c cfb93ec56c124f1df3c47fb8febdbd1d4513ba5f8ce4a47d7c099b1c5d9ad51a
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -761,34 -758,34 +759,34 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c 0ad4e0885294b3a0e135a18533590ec9ad91ffe82f6a08e55b40babd51772928
- F src/os_win.c 970c80992fda8bc026154fc87879609f00c37472004f3a06626521b3868d694e
+ F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6
 -F src/os_win.c db4baa8f62bbfe3967c71b008cea31a8f2ff337c1667ff4d8a677e697315ff0d
++F src/os_win.c 43861102577a5157c29335d893e1dc6c808d36a3878003bf0e0d4864b8c53c94
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9
 +F src/pager.c ab7704b78c764cc89f477a0c10e53eb3fee8acc1d1306807354c626513c71a4a
  F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
- F src/parse.y a7a8d42eeff01d267444ddb476029b0b1726fb70ae3d77984140f17ad02e2d61
+ F src/parse.y 8ec56598aa0df92428627502267d0d1c9778cc27308f8ffd31dfb2d017a8755f
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
 -F src/pragma.c a2ec3657a953fa7dea7c1e680e4358b6ce6ae570b6c5234e0f5ef219d308d223
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 -F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126
 +F src/pragma.c 82fc31a123da36fdd8966fcb83d43185fd9f0c29de7d5f380770b2feff9ce582
 +F src/pragma.h 50f6d3b408ed56bde4f4e4aead8c0b2022030b692e8de237c1b7a0b5ce87a0c8
- F src/prepare.c 2b6fdbfb4b859aa1b40777019e2f9759dc62c5283cd73f853a06c97acd722804
++F src/prepare.c 64fb8aaf3c0ad0a5a12472bd7f5ec8d2e569f186c555e6ad4bf962d751e30325
  F src/printf.c 6a87534ebfb9e5346011191b1f3a7ebc457f5938c7e4feeea478ecf53f6a41b2
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
- F src/shell.c.in a7351eea9758d4111aea4c9d83c3c62fe9159b64f0463e4d3abb19f45653f959
- F src/sqlite.h.in c61995509640a2fd40970e28394425bdfa42f2f4b046bd96bb93d7c128ea2cb8
 -F src/shell.c.in 9a0011ee9650818782ee746e0e8747568a6f02fb3ae323dc6e27fa1a61457523
 -F src/sqlite.h.in 4d93768709c53b7c653a63817a82d5a8625264ca0d8cdf99967ba147bdcf2aa6
++F src/shell.c.in a0aa862ac41e7c54aab33d418fb20e8f701c33e7f8cb0c81f44467c1a22489f7
++F src/sqlite.h.in 406f3d921635fe05970ce8aaf91129f9301001aa6f9f07acfbfd35e03e1604d6
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 -F src/sqliteInt.h 77be043f8694f4a8702d0ee882022b2e5a6489a0493e77c5d9a73f1efc5a2cc1
 +F src/sqliteInt.h 94d55fd7272cf1a553db7dc953e4190cb98065a38d82f0a9c2488592c6cc6f52
- F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
+ F src/sqliteLimit.h 6993c9cfe3af5b8169ae0e5f15627fc15596726d4f1dc90a221309f79715ce88
 -F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 +F src/status.c 5028a0afee355aa492f26f0b6a3ec23145caa9261a93164d96cd0b9bf1b2318f
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c a068917be2fce183452295ba6fc291bb6f832c64804d5ffd5fd2f9485b28df8a
 -F src/tclsqlite.c c4b0b27b0ad34e4af085040a1ebe94a35ad5161663cd905d1b947f7884691bff
++F src/tclsqlite.c 39e66a97602c76ad1fe8bc3547542ca4cf7b9d687fadf72049bb754111064bbc
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
- F src/test1.c 9df74d1d8c0513b0f906942d004b7d7aff5c6f47320a921a0b890748bac0e34d
+ F src/test1.c 2d507751bfb4aa254dc22588ef1e3c5c5cfcb2e636d0e6e1fa0bbd307669c2a8
  F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
  F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
  F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@@ -846,13 -842,13 +844,13 @@@ F src/update.c 0e01aa6a3edf9ec112b33eb7
  F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
  F src/utf.c 8b29d9a5956569ea2700f869669b8ef67a9662ee5e724ff77ab3c387e27094ba
  F src/util.c ceebf912f673247e305f16f97f0bb7285fca1d37413b79680714a553a9021d33
 -F src/vacuum.c b763b6457bd058d2072ef9364832351fd8d11e8abf70cbb349657360f7d55c40
 -F src/vdbe.c 8a6eb02823b424b273614bae41579392a5c495424592b60423dd2c443a583df0
 -F src/vdbe.h c2549a215898a390de6669cfa32adba56f0d7e17ba5a7f7b14506d6fd5f0c36a
 +F src/vacuum.c 38577d6f45e10a984720b5219be09ca8649a0e600c2e5c11993900446caca609
- F src/vdbe.c 9708a33414f9e9bd98e69a9f2cbab9cd1373629194cf74b9547f615af58a0d38
++F src/vdbe.c b0d83eac6537a14fb1d7830a357c96688fe464f750c424efea11c9fc3c017547
 +F src/vdbe.h ea7ab8f088ae87a71a733f7ac4c5edd9c34dd58dfa6aafbdd3ab81b2d4c9d496
- F src/vdbeInt.h af7d7e8291edd0b19f2cd698e60e4d4031078f9a2f2328ac8f0b7efb134f8a1d
- F src/vdbeapi.c 53c7e26a2c0821a892b20eee2cde4656e31998212f3d515576c780dfaa45fd17
- F src/vdbeaux.c b05aa2c43ad0f82eae945618c1bb538467f52f5acdc55d2b0a29fc261ae840f7
+ F src/vdbeInt.h 2da01c73e8e3736a9015d5b04aa04d209bc9023d279d237d4d409205e921ea1e
+ F src/vdbeapi.c 6353de05e8e78e497ccb33381ba5662ccc11c0339e5b1455faff01b6dacc3075
 -F src/vdbeaux.c f0706ad786b8a6c5bc7ea622f3916c2ba2b883abc872d0b4911c4f021945c0e5
 -F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
++F src/vdbeaux.c f996e9cf73145a000cabe087e5521facf7f2b6216068b9fe0070442a1930b6ef
 +F src/vdbeblob.c 9e61cd32f3b52bb82d8997f87ecfb0506af1d846f04bfe02d2ac1ab1929692d6
  F src/vdbemem.c df568ef0187e4be2788c35174f6d9b8566ab9475f9aff2d73907ed05aa5684b2
  F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -1729,9 -1718,9 +1729,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 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
 -F test/testrunner.tcl 90ed8b6c2b26dc1f6af08aeb04670a5df86172f3d9828d8af000f972afa50061 x
 -F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6
 +F test/tester.tcl 14284e98554d0a27c3982dcf4b7c4b88cf025ae8e238dd7e2683071c51c371fd
- F test/testrunner.tcl 6a63b99f001d30a18a2a28bcb9239001cf1c7ff89e96fe1f1895f9e0d10e22cd x
++F test/testrunner.tcl d70cb97fe460185ba228c5652adbba1a14af841224a3bf315bffd2d1157fb347 x
 +F test/testrunner_data.tcl a1f30ea7d7ec017f50ebae0c305aa6833b44c364d02705d328ecc649212076e9
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -2201,8 -2189,8 +2201,8 @@@ F tool/stack_usage.tcl f8e71b92cdb099a1
  F tool/stripccomments.c 20b8aabc4694d0d4af5566e42da1f1a03aff057689370326e9269a9ddcffdc37
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
  F tool/symbols.sh 1612bd947750e21e7b47befad5f6b3825b06cce0705441f903bf35ced65ae9b9
 -F tool/tclConfigShToAutoDef.sh 44ec55046d86a3febb2cb3e099399b41794e80e9cd138eee7b9b016f819e882b x
++F tool/tclConfigShToAutoDef.sh 44ec55046d86a3febb2cb3e099399b41794e80e9cd138eee7b9b016f819e882b x tool/tclConfigShToTcl.sh
  F tool/tclConfigShToMake.sh 7c065d81c2d178e15e45a77372c6e5a38b5a1b08755301cd6f20a3a862db7312 x
- F tool/tclConfigShToTcl.sh 44ec55046d86a3febb2cb3e099399b41794e80e9cd138eee7b9b016f819e882b x
  F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl fa2f37ab39b2a0087fafb6a7f3ce19503e25e624ffa8ed9951717ab72920c088
  F tool/vdbe_profile.tcl 3ac5a4a9449f4baf77059358ea050db3e34395ccf59c5464d29b91746d5b961e
@@@ -2210,9 -2198,8 +2210,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 12fc5fd5e0ec539faf6d0965096e20c2eea1c0cf5fe9704f8f1479a37b10a333 68eb7a64d0ac177c3421b0b107059f8db582f972bbafb3ea718ab81969ebf420
- R eb2d93f65f416bf50bf51013f79b5896
- T +closed 68eb7a64d0ac177c3421b0b107059f8db582f972bbafb3ea718ab81969ebf420
 -P 9b79b999d4192a3a250bf343825f61e9cb83203e4d94dcfa20c320d5f1386d69
 -R 327f4f8a7444c4d4336a89e4ec576fd8
 -U stephan
 -Z e12fcd84e46ac65f835dccb3914d7b22
++P 4e4885a067523d1d7ae67af00414e1beb430b16e150b6d07025645528b2d0da6 e1330ecf170436678c5c235557fb95b8acbf4fad62583edba4af03aff49afbc5
++R 0582fbd00eaa697cd9a64d93ce8f79ed
 +U drh
- Z e15b96d712795de36515216402b7b089
++Z 4267576d75d7e3187d45433bba2545de
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index d9618bd07a31820aadfc8980c7ea7bd9f61c9c9e,82e8bdd0a3036b6aa0dd187dc61b52afbb0187c4..c59f293f5c606fe5da3babd745f4590614657754
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4e4885a067523d1d7ae67af00414e1beb430b16e150b6d07025645528b2d0da6
 -e1330ecf170436678c5c235557fb95b8acbf4fad62583edba4af03aff49afbc5
++00d021eda4694ba5149fcec1f6563317f87b59c70a779ea6325b2620dd7bf51c

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/shell.c.in
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/testrunner.tcl
Simple merge