Merge recent trunk enhancements into the begin-concurrent branch.

FossilOrigin-Name: 59303e69c3de3fb4e64d4db2b25bf4fcd30dd1332781bff70f710dc01c5aa25c

diff --cc Makefile.in
index 2795ffa9e8951de31817f640468afe7cf07a4226,2795ffa9e8951de31817f640468afe7cf07a4226..196357a1e300039b9d266ceb997ecabd64719588
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -432,6 -432,6 +432,7 @@@ TESTSRC = 
    $(TOP)/ext/fts3/fts3_term.c \
    $(TOP)/ext/fts3/fts3_test.c  \
    $(TOP)/ext/session/test_session.c \
++  $(TOP)/ext/session/sqlite3changebatch.c \
    $(TOP)/ext/rbu/test_rbu.c 
  
  # Statically linked extensions
@@@ -520,8 -520,8 +521,9 @@@ TESTSRC2 = 
    $(TOP)/ext/fts3/fts3_tokenizer.c \
    $(TOP)/ext/fts3/fts3_write.c \
    $(TOP)/ext/async/sqlite3async.c \
--  $(TOP)/ext/session/sqlite3session.c \
    $(TOP)/ext/misc/stmt.c \
++  $(TOP)/ext/session/sqlite3session.c \
++  $(TOP)/ext/session/test_session.c \
    fts5.c
  
  # Header files used by all library source files.

diff --cc manifest
index 9d3d25aed5490ca6c02904768c5cbf2e5dc51011,12a3b0afb68ebd330cc92f3b54f5a2e56836c584..4305981aec2c2c6c37bfd9962bad63a8042124cf
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Update\sthis\sbranch\swith\slatest\strunk\schanges.
- D 2021-06-14T12:23:21.016
 -C Add\san\sALWAYS\son\sa\sbranch\sin\sSTAT4-only\slogic\sthat\sis\snow\salways\ntrue\sdue\sto\scheck-in\s[c21bc5a2353e660f].
 -D 2021-06-16T19:23:24.924
++C Merge\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
++D 2021-06-17T17:29:56.258
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
--F Makefile.in ff5ac24ec9cb700135ee4453fa14c18ea371e94250d3673bda1f2cb56e1108ce
++F Makefile.in 7152dc2a5b5e0bf0f74a1d74a86f1c72dd44b6fc23dfcf33f64cafc81265c22e
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
  F Makefile.msc 8285e1ea7264f32b08702866d69dd127c0f663bbc2002323d853c68c27c6b6e4
  F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
@@@ -488,12 -483,12 +488,12 @@@ F src/analyze.c 01c6c6765cb4d40b473b71d
  F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
  F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 399e1ebcd6c4f9ad47f5457bfe3623441db287f0923433cf6539497791557be8
 -F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 -F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 -F src/build.c ea28944f65b04f771e7aa5d614d406faa1bde5fe4ce882e2ead73049f03ed568
 +F src/btree.c cebbb6e1a01b46e9f5fad81feb7ea7ca0581737fd866d7b07d6039dc4f00f400
 +F src/btree.h ccdc64bd1eee7ba79d4c0b2af22b6df1e5ededdbf9606f45f4fca4738dd6fa0b
 +F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
- F src/build.c 7f4bc67cdf0b35126239f5844ea03ddccb857c04abef9018913a2f6edf60d119
++F src/build.c 22e91195f1fafdde9e181167a983efe859232947bf40f173e1b82f02c6ad21a0
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
@@@ -504,7 -499,7 +504,7 @@@ F src/delete.c 62451bba9fe641159e9c0b7d
  F src/expr.c 30a2abf526531ce6bd45fbc85bfec0fc3f6e5a0fb490cd2350855f2fc34dd789
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
- F src/func.c 0e97ea309f882c4045a73d25219d816e60d2baf3c60068bb5d74f801a46355a9
 -F src/func.c 9eb67f0aaf1cf439c21d6fc8afe270973d6e8345af3f1ebda98ad42186d30f5b
++F src/func.c 0db1adba687878f4cb1234b5c0b3d0945023399aa7ea1213cffe7b11e25fb01f
  F src/global.c 25ba4d58476f6be29bba9d9d14f7f146b78476d3a4d75ebb8c3b736328afe0f9
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@@ -513,7 -508,7 +513,7 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 12684b3f19cd103cea97cdf14d0758196d0c646e12a898d7245141a9abfde9a4
- F src/main.c 26ecd5ee511a179909fcc99b511aa80b541c9a96aaf0ef772a03483cbd58f185
 -F src/main.c 9c06f8dc6137aaa990692ce30db1c00c3e6a574c5a4756640625c19b507c65ec
++F src/main.c 76dc97dd9879a73dd88a8b523e117b570748a67fb1c146258bfc24829299061d
  F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -533,12 -528,12 +533,12 @@@ F src/os.c 59ed1f503347e8b5434c0ce7d7d0
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c ff4738e222bbbc2ecc396398c8ba1ae757bee03b782a8dd8bc8a5d39128e52d1
 -F src/os_unix.c feac74a0ba7652c405ba30f61d9e738be717d15899f2915a129ef160a3e5b26b
++F src/os_unix.c 5d4a80fe497e48d87078e67ea88e9e44cd714dc02b9f1f20f40831883f81411d
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 95c255256b13827caf038c8f963d334784073f38ab6ef9d70371d9d04f3c43e0
 -F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 -F src/parse.y 8920f4444957d7827ca458029b2e41ffa32dd3b72917be0b52cae0aace3eadb5
 +F src/pager.c 12b7e6f061247cc7e24d81dddd0161ba9e317ef3c3b93f0a299873746a07d989
 +F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
 +F src/parse.y a52d0c9a7485121232ecbfcd2086e9f9ddf12449c9fa38fda9be4932e402e3c3
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
@@@ -546,15 -541,15 +546,15 @@@ F src/pragma.c eb42cb9bec189cf18cef5d8f
  F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
  F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
- F src/random.c c984d8426d76752dbd9ff7983e770731ae5e8f4ede84a203df9878d5e8798f11
 -F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
++F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
  F src/resolve.c 35630effd4d16d2373caa41bae40a3d71f853f3ad0cb4f572f2ed4b8c350c1e9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c c586ad02fe8813acf907f5cab181993839ba2fbfc87ac72392d1605401cb6203
- F src/shell.c.in 586493be0d3a2fc1e6803577d683697dfefc0fb305cc966bb389ce4045cbc19d
- F src/sqlite.h.in 31e664dde4af28891280ff51a1f38f647c2d9e89f3616a22c66f25407a16f569
 -F src/select.c 4fa607bab6bcc580f12dbaf9c800b2250a1e408f10321a1d3bcb1dd30c447e62
++F src/select.c 3e7dcf9289592d1a3f73a3a1d480afe460df21c921c63665f71cffb21d91a62f
+ F src/shell.c.in f3e91c697f33daae14923355dcadfc26bb0c1eabdb343e5508706893e017a0a6
 -F src/sqlite.h.in 8549395aa13361d5dcea04e3a57d680af10f7ee0989c45ebfffe3a3bcb2cdc3d
++F src/sqlite.h.in 7c316672fab387f00b9bbc086dac23ca302904db453c48b33683c2835e5bb9aa
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 887c428241dfedd95c6447c3dfc415514351bf10af9867c0718b84528103c156
 -F src/sqliteInt.h ab37a8dd95884fc25ef1eb7b6d53d6674905c67298affc2b5bf947f739096504
++F src/sqliteInt.h 604ce0793751ed64efbae0408b78f64d8b59ab1f49e3890ba0fc936a049c0a78
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -625,18 -620,18 +625,18 @@@ F src/vdbe.c 6a7ca429e7d385204ac159ec04
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
  F src/vdbeInt.h 465fcb494db4ca6630fb9c19b2f3dfed597fbe885b0d4204193a5093b0dd7dc6
  F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
 -F src/vdbeaux.c 065a10392378109f08435bd50d03dff315e384cde2831d6b8dbaec05f33b10af
 +F src/vdbeaux.c 708f3479a4b1f895f654e29b4fa597ee4c2927ecde3a27ed07dda964a3a12b3a
  F src/vdbeblob.c c6b8db50b227f66fb404215732068df76485b5b433e5f9d4d9ac27410b218193
  F src/vdbemem.c 53881aa0a7845922a075b3f375695588618098871a7a4120af4c297b80fa3e64
- F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a
+ F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2
  F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb724
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
  F src/vtab.c b928405ccb66040fc6c3a11eaa93ddb02cbf20f9ab6860b301b222b9b50dc089
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c c8ec20a1ca161d5635a4f19c2a4efec2e006e19a8a61f272bf6bce1c80ab7436
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 +F src/wal.c 59ad6d70c32f6e52d9695b081a429b5c2ed76b116bee5dcfed88d3e78148164a
 +F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
- F src/where.c dc062832c30aa6c5f17805c1235b2b621cd9db506412d5d3ef0799d26ae3396f
+ F src/where.c 4caf843825c6292440113258fefaa6f747fd570c6915628957e42e39529988f5
  F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
  F src/wherecode.c 9f1f65d11437b25cd0a1497a170514c785f19ce6ad9d3e6fc73719cb5a49012f
  F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
@@@ -817,7 -802,7 +817,7 @@@ F test/corruptJ.test 4d5ccc4bf959464229
  F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
  F test/corruptL.test df132ba9ffd6fa15038380b4154998b9904ab8f1ea78400d7da53c920cb3b13d
  F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
- F test/corruptN.test 187d14093c333ddc705ea6c4aef8355febf260d5174d1b7cbc31c1ac8867951d
 -F test/corruptN.test c2a96ff81386027f7d7e95858783aa36f82ba1532106969575e3c8f90903a5bb
++F test/corruptN.test b8fd041aabfc0a3ff173f38bdefa907c02dfe58f7e639c79bac7e2e5791c958a
  F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
  F test/count.test 5364003488249957750a5f15ee42ca1cd7b100b1131c2dc71fff266a1250bf55
  F test/countofview.test e17d6e6688cf74f22783c9ec6e788c0790ee4fbbaee713affd00b1ac0bb39b86
@@@ -1933,7 -1918,7 +1933,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0dba9010ad29e83d726f3c63e21baabc4185e1966a5eeb8bc4447c5199681436 7068f1f69b4feef49260e80902e6bdae47c21a0daa16c96ed1a0984dd1f14cdc
- R 970a023ea3d8dcee7bfba69a18cc84ef
- U dan
- Z d8970020e13f3faf27d7bfa2c0aa9f7c
 -P c3036c28259c1375cd2c480c9ca0ce7f9aa1e952be4f110dde49b2b7d72a43b7
 -R 6b8a0a7cf847af9edb1fb9387491b821
++P d81996340ae4b25a534dd921117ee458565812ea493ab9f685fbd5541f7864a9 7bd55eee1ac63cf6d5699ce85bc5a29bf51afdf7a80bce44937fa833947a40f4
++R 2a68dddbdb8417716dcf3f2f1c3f8a3f
+ U drh
 -Z a27f3d8d5b7841a565ad9f6d2ecda9f9
++Z 26c23cbdf10b000165417ee37da6d2d2

diff --cc manifest.uuid
index fb768632ae643af0cef2823d68fb18847ace6e03,fd4c15710dc65a470e7dfcacf8788c3dfa074c09..7ec2780874feb7d4a8952bd12496ab1505ed7de7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d81996340ae4b25a534dd921117ee458565812ea493ab9f685fbd5541f7864a9
 -7bd55eee1ac63cf6d5699ce85bc5a29bf51afdf7a80bce44937fa833947a40f4
++59303e69c3de3fb4e64d4db2b25bf4fcd30dd1332781bff70f710dc01c5aa25c

diff --cc src/build.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/random.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/corruptN.test
Simple merge