Merge recent trunk changes into the begin-concurrent-pnu-wal2 branch.

FossilOrigin-Name: 5b6f6514bd3dcfb45c0ac9a2c4f806fa2f2e8bd7ee62f766bdc218246b4d9e22

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 4d702a92102ac3bfbc7edf71b19337f829f1281a,a62b0d25df6b5f948d6e6417619db08d01ed3a14..1cc0a2749c99bc2c789124875526d30f96287f94
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\srecent\strunk\schanges\sinto\sbranch-concurrent-pnu-wal2\svia\sthat\swal2\sbranch.
- D 2021-06-17T17:44:48.751
 -C Merge\srecent\strunk\senhancements\sinto\sthe\swal2\sbranch.
 -D 2021-08-02T20:29:08.711
++C Merge\srecent\strunk\schanges\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
++D 2021-08-03T16:44:57.652
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 006bab4c3aacfb6dd7585dc31e0ef3a9173f71ae1a67dc61de40f0751dfde748
 -F Makefile.in 6b4a956908f78a9260c0536505ee80dad2f19e962d18588289119e101be75065
++F Makefile.in 4c56db5bf35ce7f563bff05749e4a01e600be98b922a119a473b74a055e08786
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 9f02a8577033ef069c308ffec6649f7999582e07ab3dcd4de89397f8fd74881e
+ F Makefile.msc abdae1c4217175e44d190390d52926c6477e1c6f46a42a011cf6f2f85bf1f5b7
  F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
- F VERSION 8c392f6d70d82e513a0eac622bdf23c43df3e084cb630288beba8cef3012c812
+ F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -473,7 -468,7 +473,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 52d79e3480cf765935b61cffc51fc741d2525cab32684a7d4e9ad84510453308
 -F main.mk 60cf56f344223d94f1420795bd8f17125ef7fd0b4d09b4f1a319d40d2de6491a
++F main.mk ae0a1db2fd85631859786d1678981c866e7ef2c2e790cdd1aef19ee648a4e304
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -485,37 -480,37 +485,37 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 774a2a175ec747b55046ec62f5c1208d730ee22b10bdad5f182591fa247946a8
- F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
+ F src/alter.c 3ce23a6f06a789de05e0bfd581f9dd6367a50135def2688cfd0af78675cae676
+ F src/analyze.c abbaaf7dca79d1c31c713500324fc0b55bf3eeac5b7b07001452a3d0f210de4f
  F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
- F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
+ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c b1cffe75bfb08b61a02732652367d837edb12b52c15a20fc0571cbc21a5df049
- F src/btree.h ccdc64bd1eee7ba79d4c0b2af22b6df1e5ededdbf9606f45f4fca4738dd6fa0b
 -F src/btree.c 467993910fafc86a6361eaec70b8861a94088616b3930b7f62a016e365c7076d
 -F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 -F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 -F src/build.c 8b1f2a80155a1e140030848fdc951ceb31c055212768d992d62d3bca1c588942
++F src/btree.c c80e07516ddb0746e081336a08605aa0c344612ce6f405db0faa900b121170ed
++F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 +F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
- F src/build.c 7c78076480480aa83547d1c797004d501a8fc3b7ae027fdf6c45d28ca571abcf
++F src/build.c fd8aebe6b6ff81dec5859eb15eee0f3e4a5429c9786109d4271072248984f2bd
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
+ F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
  F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
- F src/delete.c 62451bba9fe641159e9c0b7d9d2bab1c48d0cff11e16de2d14000603d2af1fcf
- F src/expr.c 30a2abf526531ce6bd45fbc85bfec0fc3f6e5a0fb490cd2350855f2fc34dd789
+ F src/delete.c b43f0f4db586acf0b4078e3982485c26fbec984674df513d5ade48a08a323c5a
+ F src/expr.c 0d541b9f9ecddf9d6d310f31922006f03509d7264ef53ac39c391b82a62383f9
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
- F src/func.c 0db1adba687878f4cb1234b5c0b3d0945023399aa7ea1213cffe7b11e25fb01f
- F src/global.c 25ba4d58476f6be29bba9d9d14f7f146b78476d3a4d75ebb8c3b736328afe0f9
+ F src/fkey.c 7713a4e87755afbe85d1cb3e3e36b6a9989dc24a210a4e99bf2af9a9ae2851c2
 -F src/func.c c224240cbc97fa5e9c4fe9acb128716cb835ca045532bca6951b7c45b020c56c
++F src/func.c 016d367597b88bbac0f78979df343abf50b225f76a8f3780d258c6b5f4f6441a
+ F src/global.c 5eba017ebbd887e2365e6e6e815e1619e41406b8946d17594e94116174787df5
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
+ F src/insert.c c6419bc4b447f3d4cdb7b1167690baaea3b796a80cea48e7cf26da65487d430d
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 12684b3f19cd103cea97cdf14d0758196d0c646e12a898d7245141a9abfde9a4
- F src/main.c 76dc97dd9879a73dd88a8b523e117b570748a67fb1c146258bfc24829299061d
+ F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e
 -F src/main.c 2c17a667133d2d1666319cfef975a48aa640a3de0c57d68b362372a12ad5557b
++F src/main.c 46e139128fbcec8c20f32a49afd6b6f8593b2f76cf85ea63b27459c822fa3099
  F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -535,33 -530,33 +535,33 @@@ 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 63d998a28fc6d71e4333db3bf42ddbf674b375826ad1bad2f4305552bb4a5a25
 -F src/os_unix.c b11e4610769922253dec27d7af4a07ff84f65169d19bda5e9b12a152a706f7f5
++F src/os_unix.c 3e7b5ba36dd853de04f5b14a023ce3bc929297c63815d8c4a988e193fdb69135
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c e007e483923437707b8636d7450f1656e63c8d2dc1e09a605c24b3a9a1900220
 -F src/pager.h 9d38ac4b9f0e1361f7ddb6aa0675a54f5e4f085703108d3aafe7868872113f92
 -F src/parse.y 0ba0baec5de6921ec8ba8bbcf1018969144ef29d26112e17539d8fbb1662e3eb
 +F src/pager.c 08f6583f5463ea4e0d1a584455a321bbf66475fa33e740ea5731751558e77ae2
 +F src/pager.h 034a193e53d6649bdb641aa996e38094dbb7cbe365d8c10eba871a38a0f5ebb3
- F src/parse.y a52d0c9a7485121232ecbfcd2086e9f9ddf12449c9fa38fda9be4932e402e3c3
++F src/parse.y 9aff0654f0a70f45324330d3eb89164add73258343382c046fdf603786f60e6b
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
- F src/pragma.c 4577091a839722cd74e5492f10dc238a93751f4bcc0c8c9ee572d7592f3936be
- F src/pragma.h b93fd693bd38cefeaf8e2c7e8c929717f7799a9770104cdd2bae8df2a84e2da7
+ F src/pragma.c f1d34e15bdd626a361109f1360f64679b408000335e1c51a5314fd633ed2442f
 -F src/pragma.h a11b4798f9c49f156f130e1f7041a9fcc9d316a64f3501b6013acdd2e4c6f549
++F src/pragma.h cc4eb73536553008c4442f3831fba7d4b069482750e960cddc3a7a22c7489d27
  F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
 -F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 +F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
- F src/resolve.c 35630effd4d16d2373caa41bae40a3d71f853f3ad0cb4f572f2ed4b8c350c1e9
+ F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 3e7dcf9289592d1a3f73a3a1d480afe460df21c921c63665f71cffb21d91a62f
- F src/shell.c.in f3e91c697f33daae14923355dcadfc26bb0c1eabdb343e5508706893e017a0a6
- F src/sqlite.h.in 7c316672fab387f00b9bbc086dac23ca302904db453c48b33683c2835e5bb9aa
 -F src/select.c 52041124629704feb24b1bc7dabf8ec03a0857c69d23f2dd0c33c9ed3d074adb
++F src/select.c c265649aed27697c89fcb9390f872bd39a41d882d4bfe48bbbbcedc4d7de9e95
+ F src/shell.c.in 24b99dae8818d1a234732d73f4d5b49f12b510bc62735a41c04e314fafae09e3
 -F src/sqlite.h.in 43fcf0fe2af04081f420a906fc020bde1243851ba44b0aa567a27f94bf8c3145
++F src/sqlite.h.in 838e545b26809e5b3e7af4ad8ec014a0f5761f3bf531857e001d256f150b9d1a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 4d4d201a986879aec561180defb5a800dadd843a8c4da9a9a3a834daeca685dd
+ F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
 -F src/sqliteInt.h 6f02ceb8d6b8784faf7218bd58b59580837c9e95e54a5b34d48ae93504ba67ce
++F src/sqliteInt.h ce126c858ee29db4534cf202ccd49cca8d6f6e3ba36ee488a3c82cdce8f0f89e
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 97645e4a15dde6a6ad6de8d81057ff9869413b866015a89e208fedacd709493e
+ F src/tclsqlite.c 05663f6b5010b044eac0ef22fc8fb5ea3406d2502700a898261683258042c88b
 -F src/test1.c 2100f4c28bae21ce83a9a0c5ec6827efd0e15d11b93b569b614daa5654b3fcf6
 +F src/test1.c bb6fe83c5a0e255930c14cc6f0b29414410661839fcdd95015abed823df636b4
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
@@@ -576,7 -571,7 +576,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
  F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c 7768197f40225aacf0ab4a325b0c30c0dd6ebdf2c64f62da90ad5d4989b42bf5
 -F src/test_config.c 284c29912736f68b0a583a920bf63fd8f9125dffb8a75cb0676e58502b2f7908
++F src/test_config.c 8544c71df9131c25c4d0255188ec37a6e9af452f5520ee9df4bf30f35c4c7d29
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
  F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
@@@ -616,33 -611,33 +616,33 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c bae853ad129d1129c063de8630a3e99e306283bc40146f359b1bb91be2c08f1e
- F src/treeview.c 21449a944d5abd3ac07b7eab76f7221e20c9480d06f01798f8dc66d9bc361769
- F src/trigger.c e0fd347b2571a2d956318cdc6d011ccca7ce862d10a0ca04188a37920ef5440c
- F src/update.c e94570c89b2e339a7ae3e9f7f031ec69487112983e86608d93a8b1171be8b7da
- F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
+ F src/treeview.c 43f88d0fd19976a60aee6867959213b438593276f1e8179048df85f416a1ab19
+ F src/trigger.c 3f612ce5f0858b6c23460a3c799d01f408b49b0b29d931d8b8e6fc224a8667de
 -F src/update.c 69c4c10bc6873a80c0a77cb578f9fc60ee90003d03f9530bc3370fa24615772d
++F src/update.c dc362b5c6b459cb1915cadb94270f1f0de68657a82293eb5ce9aaf880d0af1ba
+ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
- F src/vacuum.c 9d6ac090ff36d80f0a2c5bfc63994b714c464bfc44efa5056c457a6a4163dc99
- F src/vdbe.c 1911efc9b6daf6539d21ece70ca6182fcceba4ee505e77056c1802e19a16330b
+ F src/util.c b18a971c8936e9299fecc00474269a11135989d6fe9bd91b1e52137d6f27bd8c
 -F src/vacuum.c 454973a59fb20bb982efc2df568a098616db6328a0491b6e84e2e07f7333db45
 -F src/vdbe.c 63362d3d487c85751ea107d75f1a7d3b76f90d9c2af2245b0f670269954f1b4b
++F src/vacuum.c a02ce4cb7c45741675bac31528b4bb7b8821727cf3306ade2b06361b4704b248
++F src/vdbe.c d1e0f2642c7770c59f2cb5a3786a907ead18c54203c5852c12d70449f1a9a9dd
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
- F src/vdbeInt.h 465fcb494db4ca6630fb9c19b2f3dfed597fbe885b0d4204193a5093b0dd7dc6
+ F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
  F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
- F src/vdbeaux.c 708f3479a4b1f895f654e29b4fa597ee4c2927ecde3a27ed07dda964a3a12b3a
- F src/vdbeblob.c c6b8db50b227f66fb404215732068df76485b5b433e5f9d4d9ac27410b218193
 -F src/vdbeaux.c 202dbaf7d1570cd53678f6b0bcad7b0642e88bc5d77abc1d5b8b9a202a6a19fd
++F src/vdbeaux.c 6570e0d95dc7489775efa8a7cdccdc3c86a15a00281bda953edc26250009c78d
+ F src/vdbeblob.c 60a7694760e35b2bba166cf49eb6a1eb0b31581102b49de78008ca3032406065
  F src/vdbemem.c 53881aa0a7845922a075b3f375695588618098871a7a4120af4c297b80fa3e64
  F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2
  F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb724
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c b928405ccb66040fc6c3a11eaa93ddb02cbf20f9ab6860b301b222b9b50dc089
+ F src/vtab.c 75bdaec808be883b8bb69a1f0a479c3a359823c5a85a26497cd5d90d3c30b74b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 24068dd5d1c25d55d4fb6e362edc2fa680a85ced86a9650d88ab3edaecb1035d
 -F src/wal.c cf63450f720845d309b4c6050b59861c423c71fbc86c6dd853dfb5ce274ffa9e
 -F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
++F src/wal.c 8e8fb6d6451ca8fa6b633d3bd8625214c8eab925de09fe9314a43f997f534872
 +F src/wal.h 7a733af13b966ecb81872ce397e862116b3575ea53245b90b139a2873ee87825
  F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
- F src/where.c 4caf843825c6292440113258fefaa6f747fd570c6915628957e42e39529988f5
+ F src/where.c 99b6e13664a7bd9a553c554978d0e253066995dade621f44cffa8928c8b493b5
  F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
- F src/wherecode.c 9f1f65d11437b25cd0a1497a170514c785f19ce6ad9d3e6fc73719cb5a49012f
- F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
- F src/window.c a6d624d83b2d5b3cfb82bb437a2fbae759c928d47dc9ad1338a9419269181bb2
+ F src/wherecode.c ef36790a797fa679f58dbd51930e3ee7ef7cb6c906ae412032e4d319a36a2eef
+ F src/whereexpr.c 3a9144a9d52e110efdc012a73b1574e7b2b4df4bf98949387cb620295eba0975
+ F src/window.c 420167512050a0dfc0f0115b9f0c7d299da9759c9bb2ae83a61fb8d730a5707f
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -721,8 -716,7 +721,8 @@@ F test/backup_malloc.test 0c9abdf74c51e
  F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
  F test/badutf2.test f310fd3b24a491b6b77bccdf14923b85d6ebcce751068c180d93a6b8ff854399
  F test/bc_common.tcl b5e42d80305be95697e6370e015af571e5333a1c
- F test/bestindex1.test 2e92e046148b3f8a2be62af9c0f307413547a33677af0df159c0fcc76e5134a2
 +F test/bc_test1.c e0a092579552e066ed4ce7bcdaecfa69c4aacc8d
+ F test/bestindex1.test 7cc626f1f4a7483bb6b38487d467db4477083be5cd93958aeda5d5127640dc81
  F test/bestindex2.test 60266e2854055788459cbfd86cef575601eabe74a2c61faba72601739fea4398
  F test/bestindex3.test e061a6ed0f519beee037ba7e7a4c37f80c8a7e4a303e2559ed1f760e4b0235eb
  F test/bestindex4.test 82250e7dcc6d5b15244edc9d6554b1760583af1b8548c2a255a1c4f28e744c0e
@@@ -1284,9 -1269,10 +1285,9 @@@ F test/pagesize.test 5769fc62d8c890a83a
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 07a6fc4ac15c05b12b18152d99a3ae8d3ab34050f6de7ea3293c6da76b33fbaf
 +F test/permutations.test 48798e453bead02d55ed1137e370b1e4c6219ba25ceeaa3b3b4ce9a45881d3c2
  F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
- F test/pragma.test 50b91bedea9324d3ab48e793f908ee7d2c7dcf84bfa2281e792838be59641ec8
+ F test/pragma.test 30d5bbebd5e9cb5383155cf3f3c81297b98f6642d152e9d4100cf6888630da2c
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
  F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8b1f8
@@@ -1654,8 -1641,7 +1656,8 @@@ F test/triggerF.test 5d76f0a8c428ff87a4
  F test/triggerG.test 2b816093c91ba73c733cfa8aedcc210ad819d72a98b1da30768a3c56505233e9
  F test/triggerupfrom.test d1f9e56090408115c522bee626cc33a2f3370f627a5e341d832589d72e3aa271
  F test/trustschema1.test 4e970aef0bfe0cee139703cc7209d0e0f07725d999b180ba50770f49edef1494
- F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
+ F test/tt3_checkpoint.c ac7ca661d739280c89d9c253897df64a59a49369bd1247207ac0f655b622579d
 +F test/tt3_core.c 8cd89ead95410f70e7fb02c79f1e040f9c5ad5cf
  F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
  F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
  F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
@@@ -1874,14 -1859,14 +1876,14 @@@ F tool/max-limits.c cbb635fbb37ae4d05f2
  F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
  F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
  F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
- F tool/mkctimec.tcl 06b0d503ee0e6c2d4abe83563b43d4925a12e31ec9fb3249ce39661f53fbd1ce
+ F tool/mkctimec.tcl 5ef1891ed3d0e8143ff39bad7c01ed60c2817a2fb2d9a09487f7ccad2df621e4
  F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c
  F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
- F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
+ F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 130b88697da6ec5b89b41844d955d08fb62c2552e889dec8c7bcecb28d8f50bd
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl d189900fe12be39539f7101222968ac7a5774a63638471f0b6bff9c35006743a
- F tool/mkshellc.tcl 5fe7e518112b262e25726f248c0f33dd153192867453984b6af0a76a88e97cb2
 -F tool/mkpragmatab.tcl 7f6db47d1995bc08247255622524567b2ab8962d98063f8aef97e35c3c54e3b8
++F tool/mkpragmatab.tcl 2ed9421d7d2c4689fff9c4945482330c0e351d14e9b3933f7f83adba27dab187
+ F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e89450
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
@@@ -1949,7 -1932,7 +1951,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 0ab899012cef8f32e1a4c9a47c54b73576f7fe3757e97353ccbc7fc87a4a1ea9 41363fb970273cb5ae2bddf53f3536de047d7d22736483089fd89493c0c701ca
- R f95380c826088e576df8ef6a9033df5c
 -P 41363fb970273cb5ae2bddf53f3536de047d7d22736483089fd89493c0c701ca 8b781dcaf68e0cf12a844708c82eee00193e340195cbca915d077e4846983bf3
 -R ddf6b4d9e70cf24ed7c04409cb754911
++P 2ff7e5624924d95b280024f67237b8be2afa1593e3ade1da6e9e68c83a21d2ea f615d7baa889030b230e0d4f018dc9f8a6fe95cd3a671d7e2b941ae3240fa6ca
++R d35dd90ef45f099b7260c4bfecceab0d
  U drh
- Z e960ebd9848538d9ad13f2ea0c4b9717
 -Z 54fc29e5fce6dd548c031e0b86d3ef26
++Z e916925e4b415837702d73a717218a58

diff --cc manifest.uuid
index 5cee7ccd96157d97ef179deb3f12a09dc94e6384,c3679aa4e6cd58bb0a31d78c83e3fd1b87e8ccda..09804c52ec035514ac1e21f5c6d612f55d0f02b7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2ff7e5624924d95b280024f67237b8be2afa1593e3ade1da6e9e68c83a21d2ea
 -f615d7baa889030b230e0d4f018dc9f8a6fe95cd3a671d7e2b941ae3240fa6ca
++5b6f6514bd3dcfb45c0ac9a2c4f806fa2f2e8bd7ee62f766bdc218246b4d9e22

diff --cc src/btree.c
index 74c81ef022559ad11e2408319dc0e0c70c7bc3a1,541ec190d85c853622cff5023018a2850dc3ab1c..4ed8a25315e3327ca1125ac2dede8038dee1c6af
--- 1/src/btree.c
--- 2/src/btree.c
+++ b/src/btree.c
@@@ -8143,7 -7757,7 +8224,8 @@@ static int balance_nonroot
          goto balance_cleanup;
        }
      }
 +    setMempageRoot(apOld[i], pgnoRoot);
+     nMaxCells += apOld[i]->nCell + ArraySize(pParent->apOvfl);
      if( (i--)==0 ) break;
  
      if( pParent->nOverflow && i+nxDiv==pParent->aiOvfl[0] ){
@@@ -9929,8 -9543,7 +10011,8 @@@ static int clearDatabasePage
    BtShared *pBt,           /* The BTree that contains the table */
    Pgno pgno,               /* Page number to clear */
    int freePageFlag,        /* Deallocate page if true */
-   int *pnChange,           /* Add number of Cells freed to this counter */
 -  i64 *pnChange            /* Add number of Cells freed to this counter */
++  i64 *pnChange,           /* Add number of Cells freed to this counter */
 +  Pgno pgnoRoot
  ){
    MemPage *pPage;
    int rc;
@@@ -9962,10 -9574,9 +10044,11 @@@
      if( rc ) goto cleardatabasepage_out;
    }
    if( !pPage->leaf ){
 -    rc = clearDatabasePage(pBt, get4byte(&pPage->aData[hdr+8]), 1, pnChange);
 +    rc = clearDatabasePage(
 +        pBt, get4byte(&pPage->aData[hdr+8]), 1, pnChange, pgnoRoot
 +    );
      if( rc ) goto cleardatabasepage_out;
+     if( pPage->intKey ) pnChange = 0;
    }
    if( pnChange ){
      testcase( !pPage->intKey );

diff --cc src/btree.h
Simple merge

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/parse.y
Simple merge

diff --cc src/pragma.h
Simple merge

diff --cc src/select.c
index 67cad09c8f3843365a9530d25f42a9ec48bb90b0,064ea758d8a5d7f4c9ac4869c09285bdfcaa9258..d358b32ec58ff03a63f64b15eb990cd3bc5a169a
--- 1/src/select.c
--- 2/src/select.c
+++ b/src/select.c
@@@ -2118,9 -2120,9 +2120,9 @@@ int sqlite3ColumnsFromExprList
          if( zName[j]==':' ) nName = j;
        }
        zName = sqlite3MPrintf(db, "%.*z:%u", nName, zName, ++cnt);
 -      if( cnt>3 ) sqlite3_randomness(sizeof(cnt), &cnt);
 +      if( cnt>3 ) sqlite3FastRandomness(&db->sPrng, sizeof(cnt), &cnt);
      }
-     pCol->zName = zName;
+     pCol->zCnName = zName;
      pCol->hName = sqlite3StrIHash(zName);
      sqlite3ColumnPropertiesFromName(0, pCol);
      if( zName && sqlite3HashInsert(&ht, zName, pCol)==pCol ){

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

diff --cc src/sqliteInt.h
index 59d075038f78a2e7310922674bb2cf5714eed7c3,083ba5a3359de6e5c20d6c6d9f82860437aeac79..d33ada65ccd9f3a9677c5d62e4787a5eef6a5602
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -1532,9 -1535,8 +1545,9 @@@ struct sqlite3 
    u8 nSqlExec;                  /* Number of pending OP_SqlExec opcodes */
    int nextPagesize;             /* Pagesize after VACUUM if >0 */
    u32 magic;                    /* Magic number for detect library misuse */
-   int nChange;                  /* Value returned by sqlite3_changes() */
-   int nTotalChange;             /* Value returned by sqlite3_total_changes() */
 +  FastPrng sPrng;               /* State of the per-connection PRNG */
+   i64 nChange;                  /* Value returned by sqlite3_changes() */
+   i64 nTotalChange;             /* Value returned by sqlite3_total_changes() */
    int aLimit[SQLITE_N_LIMIT];   /* Limits */
    int nMaxSorterMmap;           /* Maximum size of regions mapped by sorter */
    struct sqlite3InitInfo {      /* Information used during initialization */

diff --cc src/test_config.c
Simple merge

diff --cc src/update.c
index 15ebb77179f561a3c2a99f058ea9252ec81d56db,484bee47cd86e8eda539b6c489bc6c4986fb0c65..35684386dd15224b1f04be99419f28b0ff09d6bc
--- 1/src/update.c
--- 2/src/update.c
+++ b/src/update.c
@@@ -449,17 -451,7 +451,18 @@@ void sqlite3Update
    */
    chngRowid = chngPk = 0;
    for(i=0; i<pChanges->nExpr; i++){
 +#if defined(SQLITE_ENABLE_NOOP_UPDATE) && !defined(SQLITE_OMIT_FLAG_PRAGMAS)
 +    if( db->flags & SQLITE_NoopUpdate ){
 +      Token x;
 +      sqlite3ExprDelete(db, pChanges->a[i].pExpr);
 +      x.z = pChanges->a[i].zEName;
 +      x.n = sqlite3Strlen30(x.z);
 +      pChanges->a[i].pExpr =
 +         sqlite3PExpr(pParse, TK_UPLUS, sqlite3ExprAlloc(db, TK_ID, &x, 0), 0);
 +      if( db->mallocFailed ) goto update_cleanup;
 +    }
 +#endif
+     u8 hCol = sqlite3StrIHash(pChanges->a[i].zEName);
      /* If this is an UPDATE with a FROM clause, do not resolve expressions
      ** here. The call to sqlite3Select() below will do that. */
      if( nChangeFrom==0 && sqlite3ResolveExprNames(&sNC, pChanges->a[i].pExpr) ){

diff --cc src/vacuum.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc tool/mkpragmatab.tcl
Simple merge