From: drh <>
Date: Fri, 4 Feb 2022 17:51:29 +0000 (+0000)
Subject: Merge all recent trunk enhancements into the begin-concurrent-report branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8478714ba4f63b4a70facab0c7738b10cfcb6cd;p=thirdparty%2Fsqlite.git

Merge all recent trunk enhancements into the begin-concurrent-report branch.

FossilOrigin-Name: 1c88bcfff53418e30fea3207f12e1592775be44c7c3c24e22bd0b90085c13c38
---

c8478714ba4f63b4a70facab0c7738b10cfcb6cd
diff --cc manifest
index f5b733c5b9,50ec5c7beb..33119877e3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-01-25T15:48:29.294
 -C Merge\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-02-04T17:40:59.906
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-02-04T17:51:29.975
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -495,12 -494,12 +495,12 @@@ F src/alter.c e8ac1df663bf4ec74920edd12
  F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
  F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
- F src/backup.c d2ce92803ca7bec50783b3d79bff61c9928c087498a651fbc89a7738ebaaa3f1
 -F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
++F src/backup.c 7c69378cf826e20778df98b33b80dd1976e96ad3cf6f2a0bc17e6e6b018148c6
 +F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c bdcf1b01f61807ea66e40c8259235ba6d865f23daea05b9e6eeb22343befe941
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
 +F src/btree.c f037ec5624182eef1aec337bd2f7183c69468623c0c84357bb1ae954fe13edec
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
  F src/build.c d62a68c0bcefc4a1154e3f44424b3c3c74699c6a30fb9535e2cbedb9c376a9ff
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -518,11 -517,11 +518,11 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c 1eea44389de3768ac98588c1410171cd53e7c6ad1af74049983dcbac82093de0
 +F src/insert.c 9b99840ef8ec4d2656a089dcb695d45b9f29a648a352686df9c99f91dceee539
- F src/json.c 78fdec9af3a8bfb5ae685707b2701276fec1942b8f5f26689b2701debe32bcd2
+ F src/json.c 225b00422112ecd7094a555f3ace16b25d7d5894062b823269ed03899907c2a2
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 657534339585ac234839e5187aa51d8802f292e0771c4f874b3af1f1223f81e2
+ F src/loadext.c aa919a6a7884f8b34d7b791841b24d14b1b0ab43f45b3940f4851043b2855c0c
 -F src/main.c 4806307e415189bbf91df6467d6ff923643fdeb84e782ef0d5451a14465db935
 +F src/main.c 6cf0b4988559702601967e4df335dd497df866b7ddbcf3a60d1de2ebdf040017
  F src/malloc.c fec841aa0a0400a6f7d20706178a5d8e8219a6bf562b6fe712c17f6c26813266
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -553,17 -552,17 +553,17 @@@ F src/pcache.h 4f87acd914cef5016fae3030
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
  F src/pragma.c 7c024d690a3dc93f61830f11f900e4af2357f31d081b0c79099ca5e28919cba7
  F src/pragma.h f98354c48571c490927029510566839bf9e7242569bfbb48032dafeb008481d2
- F src/prepare.c 1e23522c934d90ff42de1b9b4f782fdf0fb690b06b92d7480b471ccb2b5899ea
+ F src/prepare.c a187dade741c1f09ae118fcbbf0302511807bfc0355880927d7152eb75b8260d
  F src/printf.c 975f1f5417f2526365b6e6d7f22332e3e11806dad844701d92846292b654ba9a
  F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
- F src/resolve.c 24032ae57aec10df2f3fa2e20be0aae7d256bc704124b76c52d763440c7c0fe9
+ F src/resolve.c 0dd8e23fda88411d63b2e6650f2380fdb08e88112e9a095fc23d5a08de4b2641
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 760d9f28dbeaafef9ea54c509af94ff5695df73ad5c854efd53de32a0564ed56
- F src/shell.c.in 4ccfb3b7f38756d11d9a31f78ba1339edda8e89f616e8c67046939c87bd14ace
- F src/sqlite.h.in f3be5ed6f7a9917dac2974368b642717518a0895112494129bb4ec49968790e9
+ F src/select.c 23af49702cfb73e604f5befcebddb089d285a9a7ddf786e0a04920ff6a0fce21
+ F src/shell.c.in 5d1b61ed8641cf470534d360b91ebcf7487559121be04ed330a7bd3ece42dc40
 -F src/sqlite.h.in 3b3ce1eac1cab6298530e38b03d7b9cbc28918e865ff64c3e1c70781e43f197b
++F src/sqlite.h.in 75454b1a220e38f48a1f421287b4d335adf62d3e33fb4e9c72eaff3300910ef6
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 5d54cf13d3406d8eb65d921a0d3c349de6126b732e695e79ecd4830ce86b4f8a
- F src/sqliteInt.h 73e412061da69ac36a8a22c9d83c3722daf3b0a0d8a8c53d249f3f6a236ebb65
+ F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
 -F src/sqliteInt.h 21f4ad9b41ce7c5decd5398ada43468d4c07de8dd3cdcee02a06e937231fcc4f
++F src/sqliteInt.h 78f28b34ff380f24ac59951eb3811374927229f505886c791051a0d80eb63fb9
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -630,13 -629,13 +630,13 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 72867c740476d13f1c397015e4d3168b4e96a237a80b9afa67e1bb8500bfeeab
- F src/vdbe.c 80935b36828265eda68c3a9bb64cb9a83413bcc275d383b55725b5f796869d4f
 -F src/vdbe.c c3f0c0e71d08b37ec11757f3f3a055b064c7c9ada24774eb1f70ffc1214562a0
++F src/vdbe.c 805dfba108e1e0142c46d704c90e438e9c5f0941cc777bd3d334501e16606717
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
- F src/vdbeInt.h a27ec79d89988f9e12f2830cfa38dfca89e19eda4e31906f520b86b6ab87e0df
- F src/vdbeapi.c fefd3a5a9029b03183d83f609c746098611240816002ce480a01ea1286184f21
 -F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
 -F src/vdbeapi.c 06bff35393ca5daa3e02e38fb516df320bd52720a2781eb70c2db23ea1c746dd
++F src/vdbeInt.h acff9df89c3fcb88d9e6d440256f335d7a17f5b317275a34ddbd8726a3ab00f8
++F src/vdbeapi.c bfadc422c55551cc53ebb2d639294d9264f2d92802ff848b76bee1c14193a98d
  F src/vdbeaux.c 312d57e71e6e152243867390308aec667e05a4e7e676a674114a33f6687d3702
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c da4d594084d581be6436582bb44bb128feeb138a3e6c313eda6749ebdc3a65ec
+ F src/vdbemem.c eb6042667c02c3ef1f968235b4a170e31b23a4b6a57f65a8454eab4d36f14b7f
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -645,10 -644,10 +645,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 419c0a98dd65b9419fd07bdd4f9facc61143c33d57b0dbeffd83cf38a2e0e33e
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c a14990c7b35e95f8f9cb0dc0d6d2e32fa99135a716a04027cefa48138d280ecb
- F src/whereInt.h 8a215acde0f833a4dea3d30a7bbed9f48b4b547b5d5e34cd02acee366476ab80
- F src/wherecode.c eea33d75290efe2bb3b1a6a7bc12fcda55b0b7ebda93cd1edd58d9fa5cfb5ff2
- F src/whereexpr.c 9f64c39e53070584e99e4d20c1dd3397e125fabbae8fd414ffec574c410ac7d3
+ F src/where.c 31bc1f43b0bf679e93c3e7a7d67cbcaddc7ae746694b149b282427d337b06caa
+ F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 -F src/wherecode.c 4a0dd0403e1c9b628a420eefbe1d60da0003356de6ee18e6707480c9b995bae7
++F src/wherecode.c d57599063041c0fe3463168cdf6d752420f0898ebb66a542b1d6db76732e3f12
+ F src/whereexpr.c 2da56404a024dc8dc41a31d8b498eed2c7c6b0bb412150d88cb3327516aa3b9f
  F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1959,8 -1959,8 +1961,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 ef6fc89507ef4c430c062b29b41e3a71c0ba5449c5493b3540653c6f78b9da61 dae81f45d2bee8e5bced2564a6a85ffb23dc93fce6547760cd811acddbc09e25
- R 377d76d2d108b01b5a7dec7f642e2011
 -P dae81f45d2bee8e5bced2564a6a85ffb23dc93fce6547760cd811acddbc09e25 70049342d5ad57ea3e863bba19253934b868bacdd1c26c9371bac024a829badf
 -R b23502faac945ebd993a7d5170df0824
++P 42e6d842abc4adf8b7f4d245fabaf06badd535a54399d1214872e97d82e8c915 85054a8691cec593b0490b78715a506f25a8cbe04cbf673129c0e17f7f5fa912
++R c34967bb3f495b178c1ec91c89e54c03
  U drh
- Z e7ac54545866984354d19104badf18b1
 -Z 512010d85591fc13397cb5074c1b9277
++Z 97f5fc0ca317b989ff5733b52e4d736e
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 33ac627ab0,5881063d01..2fedebb548
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 42e6d842abc4adf8b7f4d245fabaf06badd535a54399d1214872e97d82e8c915
 -85054a8691cec593b0490b78715a506f25a8cbe04cbf673129c0e17f7f5fa912
++1c88bcfff53418e30fea3207f12e1592775be44c7c3c24e22bd0b90085c13c38