From: drh <>
Date: Thu, 16 Jun 2022 13:44:18 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the begin-concurrent-report branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0fa6ca8abb1e9b3cba99e1f0356b1da9d6c46e0;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the begin-concurrent-report branch.

FossilOrigin-Name: 8b446d0b85b66e8164e423bdc7f060f9b6cd854475d10bd41b820133b43e42f5
---

e0fa6ca8abb1e9b3cba99e1f0356b1da9d6c46e0
diff --cc manifest
index 9113371cd7,7aa3bb55ae..0218219bc9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-06-16T13:37:36.058
 +C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-05-28T14:32:10.460
++D 2022-06-16T13:44:18.271
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -510,12 -512,12 +513,12 @@@ F src/alter.c 0390ca1d69ec3626cfa9f1531
  F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
  F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
  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 d30242c1c0255409a765874e55f9161cc301b7f7fd2fb81bc0dcb5b33d2bb7ac
 -F src/btree.c 89d1b4dd5fffcc13433dd8567121b3f07a825f47d8d50851e871b184cacec28e
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
++F src/btree.c beb9bfe3e08c5cf5f21bb95547e080489150b20a51f92706a7cadbc85afc0f37
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h ed074f13b5464ea021fed9f8de2dc5cf45c7e5fa58ec98550fdc24229b11d25e
  F src/build.c 3c0a57703b4a21325829be1eff3b2d69d564afde2dda326f0eca674f9df3d0e3
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -560,8 -562,8 +563,8 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c 79a0243b5890078b5b5b07fbf37ff4bce0e5d319278fa848f9fd9d91f642ec8d
  F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c d4804a5d7b073cc60f2f66378f0701d0072a7ef792293e3d31f891d6f859f91c
 -F src/pager.c 49eab89e6a4de46664b9b5b6cef71f3472e66d256cbac1fc0dbb84a38aab3c21
 -F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
++F src/pager.c abd503a24de8c97b39bbb72f40e5ce0fb31a8a3defeb47dfe6e3da5d198323bc
 +F src/pager.h 03ea09dddd4852990d9151746a62b94ed1486f04abe5acc9ee0e80d8381bfcd9
  F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -573,18 -575,18 +576,18 @@@ F src/printf.c 6166a30417b05c5b2f82e1f1
  F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
  F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 1fe2f931b7289960984226978fdd8a6eae2eb3095a464a736241bb693dd64301
- F src/shell.c.in f7628583e3e9af448cb5dfec3792533ab884bcda9dbb2e847e10d2314439c5ad
+ F src/select.c fe52e588e4e86aff734c47f915163d216b673ccca5d94dcc1909e874cf9953c6
+ F src/shell.c.in bc98de54298e16f0552fef4b8640c1fc4b5bab04b56cbb37f9d86994805faa21
 -F src/sqlite.h.in ae776f833186d61754229e190fd062d2b4f7e9ee49ffcb5808e212b12b1ba6fa
 +F src/sqlite.h.in 8b71c0198199c7e69bef13f3adf6f0ceebe5c0b07f433c5c929b7a686c1177a1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
- F src/sqliteInt.h 8e1c8cb40d8e3a1bc229eb84d213285d6c01c537f6f5c32993f8bedd65bea154
 -F src/sqliteInt.h 38a25ea4502e68ed3ebd266ec664fd08ed8460dda61ff5f26e215f7a884af729
++F src/sqliteInt.h 0a104fc310399fd40c4ea9cabe0f3bd6be669cdbfa20283739647c294f017527
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
+ F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
 -F src/test1.c 95c688261edf59ff77676aca426b343beb9f90d6548ecb16189ce614e5a63620
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 +F src/test1.c 67b044ff004e64b15b4694fd37e79f073434624533c8f73c240fba5e5eee44fa
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -645,13 -647,13 +648,13 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
- F src/vdbe.c 09719cdedf9e750dd9a24b3218df687d746c1080ceebb0993fc1c4463cd8aebc
 -F src/vdbe.c f93cc56495900513068eb1d6738c12dae78d44efb7f8aed92a9156cf00128a64
++F src/vdbe.c e43c2cc12b91673db49ad269877d84bd631e1d92aa2c8913d2a4ee494b7e656c
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
- F src/vdbeInt.h 93dc9060052bc894d6dce6568c319e9b1fbd9d8c581e526df0f62f08c4a56f62
 -F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
 -F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
 -F src/vdbeaux.c 83e566a087cf1bf5901539554feb55d25b2be6be24d36c6682b2f30493c28006
++F src/vdbeInt.h b613abeebbdc4003926e175e5e7b8be6d20c34c874c3a3aa8703007e6d3a54fe
 +F src/vdbeapi.c 586ee6b57c507fc29f560ff3aca0b285244d3a9eba60732a067ed598fde1d744
 +F src/vdbeaux.c 22dde0cbda611cd1aa4531eb2d8fb88980aa6cdd893b85f33c80a81e59730080
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
+ F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -660,10 -662,10 +663,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 c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80
- F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363
- F src/wherecode.c 226b38cb9c54b35f2a3ad4767dd6093405d16e608b3adadaad2a9c42c7b74ef4
- F src/whereexpr.c 7c5ee52e1df81d6a43f39e6b6f35d540fd37254e2b6e953a4e2715c3abf26f46
+ F src/where.c 267caa227dd38ede46959468118ef4067316dae589d889c200911ff77df53ef1
+ F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
 -F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b
++F src/wherecode.c ac444e3c1ddb5ec1d77f959125a97b2403b90dd8d653bcb504dff35a9dbc47d3
+ F src/whereexpr.c 20255cf03e0b765b742301197d165511ff99e95da0d7ee9c8a2ebc1e888dd049
  F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1988,8 -1993,8 +1995,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 e6b5224d71047b64499e04054e087b849e9c48b71f2d9abff65935633c1d10f0 d6f6ee5cbcd9b263bc2423ce90700ec238deea212d32888fa9302fa2479b7d99
- R ba5d2b057b320627832f523fcde2ed9a
 -P d6f6ee5cbcd9b263bc2423ce90700ec238deea212d32888fa9302fa2479b7d99 3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351
 -R 5646ab56422c86c898b54f29f3641174
++P 034d2c511a8ee7c2c02cb39f1df41a01f9daa72378b59bbb5e01b0257ed7d906 221e07ed783b878c0148feb57aaee0b80ee5567d9176b3ddb8dd853e02a9d08b
++R 90802af1f95713c31b2a2c8c3cad207a
  U drh
- Z 0981be974d91f8ce773b30eb4c18f78e
 -Z 7141c4254e7e69d6e9b9eb39772406e3
++Z e7559b7078bb75750e5c3c9bbc1c10a0
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 854b86d989,e92c571948..b063b6dcf1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 034d2c511a8ee7c2c02cb39f1df41a01f9daa72378b59bbb5e01b0257ed7d906
 -221e07ed783b878c0148feb57aaee0b80ee5567d9176b3ddb8dd853e02a9d08b
++8b446d0b85b66e8164e423bdc7f060f9b6cd854475d10bd41b820133b43e42f5