From: drh <>
Date: Tue, 22 Feb 2022 19:37:35 +0000 (+0000)
Subject: Merge version 3.38.0 into the begin-concurrent-report branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32870a164720d2a1ff24aafb868520bd2bea3cf3;p=thirdparty%2Fsqlite.git

Merge version 3.38.0 into the begin-concurrent-report branch.

FossilOrigin-Name: 0bbf7be25d366e0a08866a3a7e74b9b4cd9964b970bf21e72cd636e4f5a489e8
---

32870a164720d2a1ff24aafb868520bd2bea3cf3
diff --cc manifest
index ec52d08d25,7db171058e..8df7be2da5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-02-15T20:24:33.484
 -C Merge\sversion\s3.38.0\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-02-22T19:30:14.175
++C Merge\sversion\s3.38.0\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-02-22T19:37:35.956
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -495,13 -494,13 +495,13 @@@ F src/alter.c e31cae888bc3077e34f9a82c6
  F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
  F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -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 701beb1950402930d304de7dd96ea62e5682f15a88453c695121c4984cac45b6
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
 +F src/btree.c b0a6e1e1fc86f6dd95e70cdd2536d22e5f2a42ef497e4fd98bdbe1d0b1f4fa3c
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
- F src/build.c e654e5dacff941bb88177bbb3c69d9dfbe6efd302cea018b5ebf1f7b224be9aa
+ F src/build.c 817d5269b72ea1d61ad4b22592616b2e06172ecd1ab74f90ff6a52cb93ddabd2
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@@ -559,17 -558,17 +559,17 @@@ F src/random.c d4127b3d8ba155e293cc1abb
  F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 9f660188fffb63b7fa5db8fcee791277a6307e43922d7765c26e8a0754b6423e
- F src/shell.c.in 125b2c6d7c91716e2d79d132428549f371bd294a810dc5c0213fad4878f34ccb
- F src/sqlite.h.in c72f045f9e1cf700391b1b3980a7d2d31663a767ccf576765c58732ff2798bf0
+ F src/shell.c.in 302fd9defa8e2053f24c9648896b182f7ad014a016f6d05f29b8327ab659e864
 -F src/sqlite.h.in c66db3391123df875daa637aaf426d31fcaceb35c418f3a6a0528773881ca0f7
++F src/sqlite.h.in dbcce7384447aceed9472c52ca3482b3c5f044fc65139e97dd443a56ef4bc9ea
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
 -F src/sqliteInt.h 16215a0d9366ee72a158454360e74e5d28ddc987e0e3b28ca0f36251092d8ee4
 +F src/sqliteInt.h 2ed40df981fe4266e4adda73ccf9e1d79f3986c485d5699af59f482046dfa3c1
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 48f291e1a7e672a7204884d4c164a8ed3a522ff087c361ada2991f5d54e987f6
+ F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
 -F src/test1.c 85b55c1154f0568856f7c8a93c8549613595b7d861803a7dca7b056383ba2ace
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 +F src/test1.c 1dacc5b0ae797830599165a00e3102ce6d84e82e4967c5412f8721112a3cf4e1
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -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 805dfba108e1e0142c46d704c90e438e9c5f0941cc777bd3d334501e16606717
 -F src/vdbe.c 61739ae108ab18d3ea9f674906f11decdce5d9a52f37c2d6359dcdfc4d8d4ef4
++F src/vdbe.c 836387e63fa05e803b7a2f4a1fcadfb4797062940e2a65630fa090691ff5c6b4
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
 -F src/vdbeapi.c 8863ffb5a7bac42fe9a68aaa3526ee29fc18fb02a9b27188b756de41e33856e9
 +F src/vdbeInt.h acff9df89c3fcb88d9e6d440256f335d7a17f5b317275a34ddbd8726a3ab00f8
 +F src/vdbeapi.c 649ae899b771767cbb0f7e6f4058ada1475b91434ccc64e8da34c97e4032fa67
  F src/vdbeaux.c d0fed930f5c63fd49c0e0f4e576e3fa03078614497154ebeb2e7aa2cdd144802
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c eb6042667c02c3ef1f968235b4a170e31b23a4b6a57f65a8454eab4d36f14b7f
+ F src/vdbemem.c 7737f0b1c480a32b057849c804d2f21d5389649bb8be80f77ad75df700adc9a1
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -1962,8 -1960,8 +1962,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 1c88bcfff53418e30fea3207f12e1592775be44c7c3c24e22bd0b90085c13c38 94838f16baf810054926196f277be4688359c502cb7e6872e3e3273a9c67e56d
- R 7a76a9339aa318833fc2492981c138ba
 -P 94838f16baf810054926196f277be4688359c502cb7e6872e3e3273a9c67e56d 40fa792d359f84c3b9e9d6623743e1a59826274e221df1bde8f47086968a1bab
 -R dcc22eba1227a8849a9c08b70a2aa236
++P 213df7a0631e4563f2c5f9d50798b78d5e201b1866467ba4e4883dc61de11010 c5998c43c160d1c84624a516e5c1c91a365fedea1082dc02589d04495ef090cf
++R 790aede9e708dbdcbb2454b911c131f3
  U drh
- Z 741d44772b8fb8c56a4c48a733c9c50a
 -Z 40a09a9d313fcdab71d684791a6d2f4c
++Z d19d1afdb7986fe37e79496c3fd17580
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4cf2112bbc,1c404a1a37..0c6568bc78
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 213df7a0631e4563f2c5f9d50798b78d5e201b1866467ba4e4883dc61de11010
 -c5998c43c160d1c84624a516e5c1c91a365fedea1082dc02589d04495ef090cf
++0bbf7be25d366e0a08866a3a7e74b9b4cd9964b970bf21e72cd636e4f5a489e8