From: drh <>
Date: Tue, 30 Jan 2024 17:02:27 +0000 (+0000)
Subject: Merge the 3.45.1 patches into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b16f4dcda28257b9591aa2589b3533f547561310;p=thirdparty%2Fsqlite.git

Merge the 3.45.1 patches into the reuse-schema branch.

FossilOrigin-Name: f98a99fce5dc0aa5dd90e53f764e1b19b71c3a80632817b566dd241ce584beff
---

b16f4dcda28257b9591aa2589b3533f547561310
diff --cc manifest
index bd2d090e24,993b2d44c9..e08012a512
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2024-01-13T20:38:49.101
 -C Version\s3.45.1
 -D 2024-01-30T16:01:20.753
++C Merge\sthe\s3.45.1\spatches\sinto\sthe\sreuse-schema\sbranch.
++D 2024-01-30T17:02:27.955
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 24be65ae641c5727bbc247d60286a15ecc24fb80f14f8fb2d32533bf0ec96e79
 +F Makefile.in c579d5b6a16e668d7ef3a77c3adf96d642d58d7fc6d04bc07c2ab561aec84ded
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 -F Makefile.msc df56c06ef05add5ebcdcc9d4823fb2ec66ac16b06acb6971a7420859025886fa
 +F Makefile.msc b834976e33a0a68519b276c42f30f31a07dac27187099f865f52b306694733e4
  F README.md 6358805260a03ebead84e168bbf3740ddf3f683b477e478567186aa7afb490d3
- F VERSION 73573d4545343f001bf5dc5461173a7c78c203dd046cabcf99153878cf25d3a6
+ F VERSION 3053efa694656bdb7936806c93ba21037a14b66bd098c655957dda84f3c092dd
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -575,8 -574,8 +575,8 @@@ F ext/session/test_session.c 7b94ad945c
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 -F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
 +F ext/wasm/EXPORTED_FUNCTIONS.fiddle 7fb73f7150ab79d83bb45a67d257553c905c78cd3d693101699243f36c5ae6c3
- F ext/wasm/GNUmakefile 99aad6d6a28c43573f80825e986427c1a024a3298aaf0c69c56a0c6b336f12c8
+ F ext/wasm/GNUmakefile 8a4d5ca21d7f21c4751ef732f2bb837c915641ee8ad25753929998fa44847e61
  F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
  F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@@ -677,11 -676,11 +677,11 @@@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
  F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
- F src/btree.c dee25e097b749275333b55d64a5ffc079249576f8e88a2ee476468cf67510f4b
+ F src/btree.c c64df2b1623501e397128261de58d3ab44c301e4eb993a4055aa971444420200
  F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
  F src/btreeInt.h 3e2589726c4f105e653461814f65857465da68be1fac688de340c43b873f4062
 -F src/build.c e7d9044592eeeea8e78d8ae53ca8d31fd6e92ca0d4f53e2f2e8ccf7352e0b04b
 -F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 +F src/build.c 9a8a4b14de796bbd9b93562f85158e74f8fcb7f9894cc1b6de9b8d2437d7eb16
 +F src/callback.c fbd4e8247f1a7f37aec721bde0e312e79cc3bfa41f55a59930bc876ca6baf455
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
  F src/date.c 3b8d02977d160e128469de38493b4085f7c5cf4073193459909a6af3cf6d7c91
@@@ -698,10 -697,10 +698,10 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c 4913fd22c4f0fa30643afb93a4d78d289cd490620e782b31016c3d4b2049b1cc
+ F src/json.c 31eb3e138661284bc561dd8d23b948126716847571d5b6e86044a284fce81cde
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 -F src/main.c 438b95162acfa17b7d218f586f5bde11d6ae82bcf030c9611fc537556870ad6b
 +F src/main.c 93593ecad08c1b73a3f5d5d9ae6e81c297853fdc198fb947cd7c66bfe7e40786
  F src/malloc.c f016922435dc7d1f1f5083a03338a3e91f8c67ce2c5bdcfa4cdef62e612f5fcc
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -824,7 -822,7 +824,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
- F src/where.c 976ece3d2a716bbb64a6600cf2b3b27295282481f0669ab50bcbb6506c7f3d5f
 -F src/where.c 56277e7110e6c81918434908bb7d597b917adfa9a176f5d95eb954b93dbc57b8
++F src/where.c b32381252240f29fe0790754f6a2aa96fa9f3d9cc815f4fc6770fdffaeb29b8b
  F src/whereInt.h 82a13766f13d1a53b05387c2e60726289ef26404bc7b9b1f7770204d97357fb8
  F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
  F src/whereexpr.c dc5096eca5ed503999be3bdee8a90c51361289a678d396a220912e9cb73b3c00
@@@ -2167,8 -2159,10 +2169,11 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e07f2451e8efe332ca94499b5a6104243b258efc0b037b4c3596aa4584c92037 f47a5f4e0ce078e6cc1183e6cbb3c4013af379b496efae94863a42e5c39928ed
- R 443bf2ae4399eafe267da670a0a4eb8c
- U dan
- Z 81e2c9d56c56ffefca05aa9e8abf1502
 -P ab40e282465c989bf249453d7c6f60072a38b691f579411cdf9aad234b20f0f7
 -R 733155be1814ed819345d16353d7d6cc
 -T +sym-release *
 -T +sym-vesion-3.45.1 *
++P bb9a71574883084a1d54bdef2064931de41f31291d025827c80383fa9127c5f1 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a
++R 94cee92ccc971c102c9009a848b00e80
++T *branch * reuse-schema-3.45
++T *sym-reuse-schema-3.45 *
++T -sym-reuse-schema *
+ U drh
 -Z 27c9e9ada796013bdfd50fea314c088d
++Z 1f8d0551ef29b127350af9df45a7e83d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b9ffdd0a5c,14c388d387..40a6656dbc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bb9a71574883084a1d54bdef2064931de41f31291d025827c80383fa9127c5f1
 -e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a
++f98a99fce5dc0aa5dd90e53f764e1b19b71c3a80632817b566dd241ce584beff