From: drh <>
Date: Wed, 22 Nov 2023 16:32:04 +0000 (+0000)
Subject: Merge the 3.44.1 patches into a new sub-branch of reuse-schema.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56d35a7fd4b12f37b26d5b67f005f785d714ae79;p=thirdparty%2Fsqlite.git

Merge the 3.44.1 patches into a new sub-branch of reuse-schema.

FossilOrigin-Name: 24fc47afbd6b6b29a247cfe33daa54962aead0b9bb7046fce7e2be705a410e44
---

56d35a7fd4b12f37b26d5b67f005f785d714ae79
diff --cc manifest
index c365c1bae7,219c397733..66c089f56a
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Version\s3.44.0\sfor\sthe\sreuse-schema\sbranch.
- D 2023-11-01T12:50:19.742
 -C Version\s3.44.1
 -D 2023-11-22T14:18:12.046
++C Merge\sthe\s3.44.1\spatches\sinto\sa\snew\ssub-branch\sof\sreuse-schema.
++D 2023-11-22T16:32:04.087
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 46badf526b90a64d2753edddfec7bae8927f93329a269afbe67fce09b167abd9
 -F Makefile.in bddd493839ce057414b19cd405293363f7efb7a73a3d8f6d2ed1b59943ddfcb1
++F Makefile.in bbd3ff2959a52fbe8c4b898ed25609fe879a21eb1f1560e2327408eac60631db
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc 3f98a7226a3ba5423fdbe676fba29f39742f4ff897c275593f33f7e27ed853af
 -F Makefile.msc 59bb36dba001f0b38212be0794fb838f25371008b180929bcf08aa799694c168
++F Makefile.msc 22cfe650731e36c58e0248698724385f8880293c5dd8373d4891dd3f6bbf0c8c
  F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
- F VERSION 4c09b629c03b8ae32317cb336a32f3aa3252841d6dcd51184cecc4278d08f21e
+ F VERSION ac9b892c8f54be4e11be490d721ae6a22b0ba83f1a4b247cdda14d82b4d941cc
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -589,8 -590,8 +591,8 @@@ F ext/wasm/api/sqlite3-opfs-async-proxy
  F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25
  F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 595953994aa3ae2287c889c4da39ab3d6f17b6461ecf4bec334b7a3faafddb02
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 46c4afa6c50d7369252c104f274ad977a97e91ccfafc38b400fe36e90bdda88e
- F ext/wasm/api/sqlite3-wasm.c 038de1b6d40b2cc0f41a143a0451db60b2a6f1b5bc06de67da255c54ea1661b7
+ F ext/wasm/api/sqlite3-wasm.c d0e09eb5ed3743c00294e30019e591c3aa150572ae7ffe8a8994568a7377589f
 -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc06df0d599e625bde6a10a394e326dc68da9ff07fa5404354580f81566e591f
 +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js c5ac33e39f21a3481812d7333ca6e18853640d423a01960ca8dbc6e7c5c3c21c
  F ext/wasm/api/sqlite3-worker1.c-pp.js a541112aa51e16705f13a99bb943c64efe178aa28c86704a955f8fd9afe4ba37
  F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
  F ext/wasm/batch-runner.js 0dad6a02ad796f1003d3b7048947d275c4d6277f63767b8e685c27df8fdac93e
@@@ -664,10 -665,10 +666,10 @@@ F src/btmutex.c 79a43670447eacc651519a4
  F src/btree.c f3b09c5414de3a11db73e11e1d66f4c5e53c9e89876ff3b531a887ab656ca303 x
  F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
  F src/btreeInt.h ef12a72b708677e48d6bc8dcd66fed25434740568b89e2cfa368093cfc5b9d15
 -F src/build.c 189e4517d67f09f0a3e0d8e1faa6e2ef0c2e95f6ac82e33c912cb7efa2a359cc
 -F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 +F src/build.c 154393fc1ba71c974baffeeda4eeec4116890d553d5efe6a8847363ae8116193
 +F src/callback.c fbd4e8247f1a7f37aec721bde0e312e79cc3bfa41f55a59930bc876ca6baf455
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c eabf02c9a0ff8628938cb5d681526a8d8615895072c9798d154487276b5a2995
+ F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
  F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
  F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
  F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
@@@ -682,10 -683,10 +684,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 d69c6e28ff7b602877bda68cd20583b8487c059759aa4d154dd21b3fd99c6238
+ F src/json.c b2045aafc52f0475dc5d723d11cc0aaa9e1d233a28031b08c8174a3e407ed50c
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
- F src/main.c 70f024a1fe799d13316ca105528808f3e1fa883078849e4720a84002e7f04e74
 -F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
++F src/main.c 54f4f37cc1c38cceab89f3aa0b372cfc8c2be1756e2c6de8760a63f656af9d7c
  F src/malloc.c f016922435dc7d1f1f5083a03338a3e91f8c67ce2c5bdcfa4cdef62e612f5fcc
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -722,16 -723,16 +724,16 @@@ F src/printf.c 9da63b9ae1c14789bcae1284
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
- F src/select.c a19daa26e95f7245106a31f288b2f50c72d1f2cc156703f04c8c91450e111515
- F src/shell.c.in 9e22b97bc1ca094edbf05b66d5e1e72ca473ec6430d36565a4abbac1a55ee715
- F src/sqlite.h.in a1f5d2dedd7264a9e26f0b68302c8daa68796ee5aa6b0780e535809674f7b1fe
+ F src/select.c b3e8bb88f7a9572200fdb89cb1ef31605f45b7b2eb876d12d5102c068de905f0
 -F src/shell.c.in cbe850737d4166347bfe5fc7d695229379347509bf114cf6abeb1e384f2d7a70
 -F src/sqlite.h.in 4f841d3d117b830ee5ee45e8d89ceff1195f3ebb72d041ace8d116ba4c103b35
++F src/shell.c.in 2ed42a4ebc1af95a8ccf309ffb47c1640ac9e04aba04e6cfd6e67f0f65abdff5
++F src/sqlite.h.in 252f6a21cc4ca2fcdf5fa002a7871d9d6bf29ce5a09fb08cc44dd6923e2370b5
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h ba302cf85983332ef026642ee810d1af0a1673a09ce32ce1530117180a57799a
 -F src/sqliteInt.h 08efc0ad9ddbbc5ea859111521dff2c4cecc589c0c9a3e4840c927663b31445b
++F src/sqliteInt.h 19760427d092272ce104d0efcc132f471a841348bcfdc9d261d514a6a9673a6b
  F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 -F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 +F src/status.c 501433a8bdf64be125746a53bb9180761f9364428b59b318365eb88afd6d5cea
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c ecbc3c99c0d0c3ed122a913f143026c26d38d57f33e06bb71185dd5c1efe37cd
 +F src/tclsqlite.c df375d63a3b0f06e79f29b6876c228c8896599497d6f54adbcd12d7d71b3162d
  F src/test1.c f9620e8f0d0fa4edb239201a732c4dd1562f0cdd9741955c89332d49e14a5edd
  F src/test2.c 54520d0565ef2b9bf0f8f1dcac43dc4d06baf4ffe13d10905f8d8c3ad3e4b9ab
  F src/test3.c e5178558c41ff53236ae0271e9acb3d6885a94981d2eb939536ee6474598840e
@@@ -792,14 -792,14 +794,14 @@@ F src/update.c 6904814dd62a7a93bbb86d9f
  F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
 -F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c 60f7b6b2a12cd2e724602f2cc69d157c86c1a446cdcec97c880d090e05439467
 -F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 +F src/vacuum.c 5bc892883611a65ca75b4129bcf5cf8b0908564b357373fdeee364d3b1af7cd7
- F src/vdbe.c 6726140a178fbfebefecb390ba501fcb27241a3b317ff0f82da6bdb71ee21410
++F src/vdbe.c 7ccecf0e42c7ecc0e5920872ffde6939cb2535331c497173e2d5482e3b22eabd
 +F src/vdbe.h 68fcbf7e5e8dd2094bc712fe4198216657272c978a7e93dbdb7e6ff5791c634c
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
- F src/vdbeapi.c fe654b1f54e1feebcaed6c2ae3ed035cc65bfeb9a1169bed866abc42bfc63ff6
+ F src/vdbeapi.c dd812ddd2f7806519e9d492c820456f86628bb6014b559034506e7f9d7f683c5
 -F src/vdbeaux.c dffcf79e7e415fcd6e4c8ac1ec7124cae5257018443adf09551c807655b04993
 -F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
 +F src/vdbeaux.c ba0fcdf1c50d0c0a1d16d8cde3b86231ebf0eea9d4c6da0ffbbee7c8666da720
 +F src/vdbeblob.c 968d66a7dbeeb4036997db8bc02162429de0f068846759b781bc30e7345f864a
- F src/vdbemem.c c936e9002af4993b84c4eb7133d6b1190efe46d391cc86117ecd67ba17b1a04b
+ F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c 2143db7db0ceed69b21422581f434baffc507a08d831565193a7a02882a1b6a7
@@@ -808,7 -808,7 +810,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 01e051a1e713d9eabdb25df38602837cec8f4c2cae448ce2cf6accc87af903e9
  F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
  F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
- F src/where.c d241917a99e0c41a9938647fd927160c563c740469ca4dc7ebcd6b68fe973262
 -F src/where.c 45b2239e127beaaae2367e503ca4c82868d8fef707c7f7f4a6c0528e7d5f65ff
++F src/where.c 190d2a0a065d6033acfd0917256161dbfeca156d34772a6d4109ab457b453f94
  F src/whereInt.h 4b38c5889514e3aead3f27d0ee9a26e47c3f150efc59e2a8b4e3bc8835e4d7a1
  F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
  F src/whereexpr.c dc5096eca5ed503999be3bdee8a90c51361289a678d396a220912e9cb73b3c00
@@@ -2075,7 -2067,7 +2077,7 @@@ F tool/mkmsvcmin.tcl 8897d515ef7f947723
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 769d9e6a8b462323150dc13a8539d6064664b72974f7894befe2491cc73e05cd
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl 0e059aaab521b490c86ba3d4f945319b438558de7738e90f26c54f4ffcdd79bb
 -F tool/mkpragmatab.tcl 32e359ccb21011958a821955254bd7a5fa7915d01a8c16fed91ffc8b40cb4adf
++F tool/mkpragmatab.tcl ae506d2d7b22094dc94a0f8cdb612dd4896e87ced649515f1709d784d7bdd595
  F tool/mkshellc.tcl b7adf08b82de60811d2cb6af05ff59fc17e5cd6f3e98743c14eaaa3f8971fed0
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -2149,8 -2141,10 +2151,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 28f9a55928df351af3c1033f2ced2c8597924bb10d8c6c15303c9361bd118952 17129ba1ff7f0daf37100ee82d507aef7827cf38de1866e2633096ae6ad81301
- R 6426aa33bfedec55a4226bfe5d799301
 -P d7a59e79467cf7aa13291c58f1cc4c1e2a51494bdd28661039421868f61088bd
 -R 47f0b8f3fa8f56fafbe88d65af3f6dd7
 -T +sym-relase *
 -T +sym-version-3.44.1 *
++P 30403ce26cabfbcdd3959e3053f6644c8329103eb3b808b08a5f2262a7ea3331 d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4
++R 818591f18e7665984a804ecdf798389b
++T *branch * reuse-schema-3.44
++T *sym-reuse-schema-3.44 *
++T -sym-reuse-schema *
  U drh
- Z dabe864e55ccdffc5ef19abccbe2abd0
 -Z 46255c7e598cee75d905df6a18e31ed7
++Z c6b275e810d49c8215c62f964bdab947
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 35900ab1a2,8b8de708c1..416cbd8541
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 30403ce26cabfbcdd3959e3053f6644c8329103eb3b808b08a5f2262a7ea3331
 -d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4
++24fc47afbd6b6b29a247cfe33daa54962aead0b9bb7046fce7e2be705a410e44