Merge begin-concurrent-pnu changes into this branch.

FossilOrigin-Name: fd01e78827f22f8453ed11e5b0ec736302cc45465e5105241568eb6686ced882

diff --cc manifest
index 0a06e12c2329569a29d9a5a68fdb8f11ef6208de,90bb02e7693f98d0cdc522382389beab20acf8d2..d41c4c06b46c4da0b10d8b1afb7f2621354d8944
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Bring\sthis\sbranch\sup\sto\sdate\swith\sbegin-concurrent-pnu.
- D 2020-07-17T11:07:27.345
 -C Merge\slatest\strunk\schange\sinto\sthis\sbranch.
 -D 2020-07-30T19:37:38.299
++C Merge\sbegin-concurrent-pnu\schanges\sinto\sthis\sbranch.
++D 2020-07-30T19:56:53.449
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -39,8 -39,7 +39,8 @@@ F configure.ac 40d01e89cb325c28b33f5957
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
  F doc/begin_concurrent.md 4bee2c3990d1eb800f1ce3726a911292a8e4b889300b2ffd4b08d357370db299
- F doc/lemon.html 857495c0ce060a4e2f2ad7111135ad7e28041a32c10612279ab398eddf678f58
 +F doc/begin_concurrent_report.md 58c032ebc2d5980e3b25bbe805f2addd31be787d1ebe51f74f4f48044fa9e2c0
+ F doc/lemon.html 1edc0f916e771212792d4d077aedc05168bf13fd65d64d41b2c13e46ac0063a8
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@@ -473,17 -474,17 +475,17 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 826bc4561456094cf758f095776026f25892a2bb3a7cd86742323267dc9bdb5f
- F src/analyze.c 953a6c43870ccaf080597244e1eeb4dc2ff6cb84f9501b24e46323de36970b61
- F src/attach.c ff2daea0fe62080192e3f262670e4f61f5a86c1e7bea9cec34e960fe79852aa1
+ F src/alter.c 4bc16666a0df99d49658ec66f00ca36e541ec6cb39673ccc51be6a981fb9b2ce
+ F src/analyze.c 5cffff3d355858cd22bfc6e20ac7203510d2e1cc935086eb06f4abb2f579f628
+ F src/attach.c 0b11e00c166b622c84ec176773b1d691c61ad07d247809e3e1635d4e99e71d30
  F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 -F src/backup.c b1c90cd4110248c8e1273ff4578d3a84c0c34725e1b96dacd4a6294a908702de
 -F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
 +F src/backup.c ce116c9f5180a22a446391057a06a0cf6810260f7d314d5d99b12cfa6f17ac97
 +F src/bitvec.c a012cfe503cddd1df1a75c139baf4586acc32f25c66f79039caf1d06474434f2
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c f567a058032ebd83e313e92d809e672703f85591a0b7b1baa569d67edb23920d
- F src/btree.h dc0e437691feb87024eba74544dc193d6fe49eb4f3e4855aee26017e38d6bcce
- F src/btreeInt.h bea40a8d7da21b7a47d66139188ec55fc1a4dc4aa4c0efb57f275fb6bb07b67f
- F src/build.c 87e14ac12acd6151b631537697a36c1cc2dd8b01c6bd3a6a74971cce077ddac3
 -F src/btree.c d8388dadc769454b28417287fe2107592a154b6a838e5ca806aaafc6c55795cf
 -F src/btree.h 7c0de202ff56db220d12abdd121ddda9a94994fda869c0ea273580cd0a653297
 -F src/btreeInt.h 0fdb5107212804716ae74c1e140de46c6ad4ed2bfbbe1271a8925dbe8d12ed0e
++F src/btree.c 9069ece217f73b76cfeca3457219436477df76b63eabdd35dfbe950336f7a70a
++F src/btree.h 1b31533bd7efd217604df5da57ca12b5854d8d989a42382584d4fd0c0498073b
++F src/btreeInt.h 6c3d3586c044f2447c8c56f1feb838f461071389ac42ad295695846ba446e3a8
+ F src/build.c 1b650a490127cdc4ea91077314847a8b88478b10c0ac1a031e776865813e79c1
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e98518d2d3d4029a13c805e07313fb60c877be56db76e90dd5f3af73085d0ce6
@@@ -500,18 -501,18 +502,18 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 5d9172e972faf3e0270c1f13ffc1b448ad89072a7d31eca0288a7e6b02db61aa
 -F src/insert.c 8cce522e82d055b936ecec664c0272e38805fa63fa281ab03e97b8e37897a8cb
++F src/insert.c 1456154f974dcc6ea7710ff1c94424a890b02ce6834b0f2428216505c7876024
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 421310045bd78afefb772294a99e50f37d87ae578786a6169074e6291e30d969
- F src/main.c f7888709417c129407bb0da64e17d5d36ec854d73cd9f2875a61baf45e43b21f
- F src/malloc.c d0400b0366e1a3a2414ca4534b4a7406df34732835f37a15cb4642eb7df1a363
+ F src/loadext.c 436af4968c6954d304fce9efa12719367bd8f37b19b93b71d6ad607e85adbb47
 -F src/main.c 8cb175f49ceacf810c6ca55dff09c889856245917a246bdbd28ea99e65614823
++F src/main.c c23d5f1594a561b04a7a3a86911352e87e84b67cb858bb0cddb6cf1a96e10cd5
+ F src/malloc.c 22d5bdd9fe88ae4fad1b91a1b9735104b82853ffef868f1f05517d60dc1875f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
- F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
- F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
+ F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
+ F src/mem3.c 30301196cace2a085cbedee1326a49f4b26deff0af68774ca82c1f7c06fda4f6
  F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
- F src/memdb.c 252137ca122acb8f54a99b48cf9f96a31d5130f19d174381a53294446d8b64a3
- F src/memjournal.c 7561c01c90958f3ba9bc6cb2d857123d932bdfa5539ea34427a0957b2e35154d
+ F src/memdb.c d58e398e315e88f95f8d07d17e80ab11259ebd6d1a10397434329eeabd1985e3
+ F src/memjournal.c 90b2ca7e2f465d57c16b69d15a9f3e3294af61088eb4938f2f7664d5ac50f813
  F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
  F src/mutex.c 5e3409715552348732e97b9194abe92fdfcd934cfb681df4ba0ab87ac6c18d25
  F src/mutex.h a7b2293c48db5f27007c3bdb21d438873637d12658f5a0bf8ad025bb96803c4a
@@@ -523,36 -524,36 +525,36 @@@ F src/os.c 80e4cf3e5da06be03ca641661e33
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 550f4daf483619ef8357d98e9caa7cc613d13369ed8ffef17994d5020c12879d
- F src/os_win.c e832e21e830c1f9409c9c54053939b6dcb14c1e92128b756204ce1e3e331d678
+ F src/os_unix.c c79bf7138f5c760bcf167065f08ca1c23f27fe06d8a4ad57432099e966823fe9
+ F src/os_win.c a2149ff0a85c1c3f9cc102a46c673ce87e992396ba3411bfb53db66813b32f1d
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c f56d84562d5bf00cfb1493320ac4f0ed19b84ac95f27054acd06fc7b7f13fed7
- F src/pager.h c5fee450e25f4a3a8610958c8f88c6ac6c3949a882748cc78a38ea73e1ce8d4d
- F src/parse.y 0724899be1d00dc438d0acadbfc2baddd4132a47268f25676ac79d56c1ee7351
 -F src/pager.c a6b0ecdeb8ba520e555406680f899237ae101645386cd57bc9fdb787d83b9a3b
 -F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
++F src/pager.c 35132c7ff21e7cef5b3c20c2f75da9bd95fe86615e8a27486f18c1dec116c0ac
++F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
+ F src/parse.y b2a9db24fee32edf26e0e4970c64394eed90f0c3608fae6f3433cc5dd3404a83
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
- F src/pragma.c 1b0db48177e52b256c003b8dc6ac708b1079a82cded944a23820574586a4731f
- F src/pragma.h f45ac571c578e80533f6c72df0725b7879bdf861fdf1f5b75433495dbecdb0aa
- F src/prepare.c 8d4d6c8aa6afefc48027c54b41cdf134b4d6bc2fc4badbe483ad7fd9e1728a28
+ F src/pragma.c bdb600be936f66b9fe69d26dfbba4528beaaf4f95c479c85b328a92484e0bf71
+ F src/pragma.h b93fd693bd38cefeaf8e2c7e8c929717f7799a9770104cdd2bae8df2a84e2da7
+ F src/prepare.c 3d5a761d026052bc888d1b803a06dd2bfe245e8e836d4689f927003549148b0f
  F src/printf.c 94b5419ad0a17269f76a9e968ca19cf9fa37617abed2e246fc48844e511b6bc6
  F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d
- F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
+ F src/resolve.c 2dd6821aac2cd27de9fcf6aa6d1f8c41b4b5841c9bc58bf1c9109008009a3a2e
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c f92fe19c23e802e58a299d1f95b4644e201a2270fc32149b6d10bd43aff0160c
- F src/shell.c.in cf2d24f54412c06e5fb34af7fabc748651125e1dceac29b740e91f06d23447b6
- F src/sqlite.h.in 936a615082f1b7d4cb915ff4491618301a8722e8190c550b466964804c964e26
+ F src/select.c 52f653249973454c4d65b715a628369e4bf754e6952d7c0192760201580de39a
+ F src/shell.c.in 352a0a6399ccae40a30f72ea06f52f3791a062bde9b8929a97f345e1584ba310
 -F src/sqlite.h.in 48dcf94e19ff17024767f549b966f5889c6cc46060d0d5f386b67289c02ec522
++F src/sqlite.h.in 017b0ed87e86a5261b7ce3070784aaefb4c0355743575af0aa1427cc81318b2a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 2d1af80082edffd71c6f96f70ad1ce6a4fb46615ad10291fc77fe0dea9ff0197
- F src/sqliteInt.h bb31b654db704d46eec7b073dde5de8bb29f01e6437634395e169ee43faa6b49
 -F src/sqliteInt.h b483045ee0e8f21168de814607ca67c9ebf7434a572e35ceb03dc9f4404549a6
++F src/sqliteInt.h ed9663c7ae0be546e253bead36a9cb74223feb108d09e9b09da81d0a859d7a31
  F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032
  F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
- F src/test1.c 4567de7e9fc79dd3b767f5b7b529159daab9514e6f2168ad22a4393a94810b33
 -F src/test1.c 0eb1528380098f397ac230c688e757efab1ba0d2459503e8ef4d826a0d8ec5c4
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
++F src/test1.c ba8ca4bd214b9ff8ba034314a7dde0cb32e1b44fd54dd8ff14cfa4dcb2387345
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
- F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
+ F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
  F src/test6.c e8d839fbc552ce044bec8234561a2d5b8819b48e29548ad0ba400471697946a8
  F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
@@@ -604,33 -605,33 +606,33 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c eee7bae3ec0bc4abee951554bf46a8ba567c0f7752ac90c820ed8afff4c612dc
- F src/treeview.c 9df54af6e5830fd527496e62ae0148e1ba33197205d8e232c2826537d42d4063
- F src/trigger.c 4ada1037cc99777f647a882cdacbd1a4deb6567b69daf02946286401b88cdc04
- F src/update.c c4f659b15422b96bfad29cd98ce6e7884516abd12552491fcc5421463bbb7c4a
+ F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
+ F src/trigger.c ef67bde309a831515dc3c2173d792574309f2f42d45f8c078743fae9f7f98c75
+ F src/update.c fb15bec5b54fd098f4b84f6abc83c7103b45ba8484011fff8edf5ae31656eab6
  F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
- F src/utf.c d7a61c1dfdac3eb091d43341a674032dca5a34e122f78ef0b5bd2d5a31967dde
- F src/util.c 3b6cedf7a0c69bd6e1acce832873952d416212d6293b18d03064e07d7a9b5118
- F src/vacuum.c c32e7add30cd49b8a7e165036a076487f59383bfef7d8576c0c98beea6822d38
- F src/vdbe.c edc605243899830f0f54c1e4563462abc5bc61ac116eaa0c1fd0b7baa74c50b0
- F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35
- F src/vdbeInt.h 33b6a8e5638ac785ba7372bb8c3f262be680cfee121c004d32cff13441109ec6
- F src/vdbeapi.c 7e7e4408744993e72783db6bb0235b3e74e0c38fa34a79677d801f3cd38aa733
- F src/vdbeaux.c 3353626ada59b81f318fb37d1894914f12022772c054ad619901bc8acc4f9f71
+ F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
+ F src/util.c c8bf30c4356b091bcc3b624d0e24b2b4d11b8be4d6c90d8e0705971e15cc819b
+ F src/vacuum.c 4f586072e58b950f31737a2f5294acf9ae077ce4dc62f991b71874c650b9e276
 -F src/vdbe.c dd83e5f93d1c3c9f6b93f7ec2cd9d062edcb92c2b2f18c3c0f0ada1f794e37cb
++F src/vdbe.c e6ece05b83be689e4a4fd850962395884d649d44d450a52207db0cd1b69f93ed
+ F src/vdbe.h 83603854bfa5851af601fc0947671eb260f4363e62e960e8a994fb9bbcd2aaa1
 -F src/vdbeInt.h 762abffb7709f19c2cb74af1bba73a900f762e64f80d69c31c9ae89ed1066b60
 -F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
++F src/vdbeInt.h 808c424389e4aad8b379aa9d29baec4a2f2680d6f0c5caeb7fce629beb357e82
++F src/vdbeapi.c f56ada7dbcdf9b88bb76cd78b02bec38bb11f9a22e7e7ee1764a1f5df9fbfa1a
+ F src/vdbeaux.c 6c7cb0a232758feaa79080991a5fc44e4265710d573f6bed1d25fbcf35cba900
  F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
- F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
+ F src/vdbemem.c 947f2a65910edb4014dc981d33e414a68c51f169f9df8c4c493a0ba840b6eb1f
  F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
- F src/vdbevtab.c ee5b4c902fdda2230f9503ac7b84c6d614c91e8f6f4dc1633e2e8dfef8ffb144
- F src/vtab.c 7b452592ed2ee95dedb1f323d557cebede5a6f3b4558b21a5dca527e6ae9b12c
+ F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
+ F src/vtab.c 5f5fc793092f53bbdfde296c50f563fb7bda58cf48e9cf6a8bdfbc5abd409845
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 85a5d4587b31e7e1d1f08914f3c05796626ed4267d0bd1e97e5370dd660ee533
+ F src/wal.c 80e75a6df96f16252f4c55ff518db0b8e48db321f5ccb6bf683b1336c432d0d3
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
- F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
+ F src/where.c 2ea911238674e9baaeddf105dddabed92692a01996073c4d4983f9a7efe481f9
  F src/whereInt.h 6b874aa15f94e43a2cec1080be64d955b04deeafeac90ffb5d6975c0d511be3c
- F src/wherecode.c efe6de4c117b5fccd04cb1f689728f6cb36d6e31dba782363d2b6ea0f39b8964
 -F src/wherecode.c 8064fe5c042824853a9b1fda670054a51a49033a6c79059988c97751ccf8088e
++F src/wherecode.c a1e168ea0c8348fd0e1a9787672131908a6c84cf179dd02d69eb6a0baf6198a2
  F src/whereexpr.c 264d58971eaf8256eb5b0917bcd7fc7a1f1109fdda183a8382308a1b18a2dce7
- F src/window.c 66c5fd1e48af7581cf90b97700268294f4da4037f120f367715f912e1148d3f9
+ F src/window.c 0dec178bfa541c757d15a2be78f34aea36393a0966600366810e5f8739ccf370
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -763,8 -765,7 +766,8 @@@ F test/collateA.test b8218ab90d1fa5c59d
  F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151ecac0b95
  F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
  F test/colname.test 87ad5458bb8709312dac0d6755fd30e8e4ca83298d0a9ef6e5c24277a3c3390e
- F test/concfault.test a88fdcd2dd959ac127a534581160fbe902080349d8703da3a8ac9633d7785a09
+ F test/concfault.test af01b1f6cca45b8f17bb13b4406ec43ab1689181a08850b990596c7a9f4e656f
 +F test/concreport.test 8192db6f7dce580231ea5a0d60c471598c7902bcac719b8be2d221060ff1c29f
  F test/concurrent.test a0248ec6e3e79a5948453649cf86b5b359175cba55ea636b15426d6f0fa6c3da
  F test/concurrent2.test de748c7dd749c77e2af2c4b914b9b09a28ac09608042ca498c0251dc6f46aa1a
  F test/concurrent3.test 530671ac706f6a1d0f4992dbdd33a86408330d03cd90fb9e82ecb1b27f5fd081
@@@ -1883,7 -1894,7 +1896,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 e2cc655e0d49ea8482f59aab910b6bec22873d0241beca70643783b6f641747f e9393a18cb987d258fff56f80ad6b1525f124fb19e8e4a9c953b86a57ef9a7e6
- R 98ec186fe9af2ebe4a44991b64205422
 -P e9393a18cb987d258fff56f80ad6b1525f124fb19e8e4a9c953b86a57ef9a7e6 96e3dba2ed3ab0c5b2ecf65a3408633e0767c884d48c270e9ef10ab9fa3ec051
 -R 2887f1182694863fc6ecdd6465aa2101
++P 12a909fb3d80fcf84646644f2904be9827c643d0a98257448777c83b4f1dc90c 2b3241cf67c8eea761760ac27df7a136bcca2dca10c152a36b216c5dc88cdb53
++R b1555df6424edb3b68be83ea7b456123
  U dan
- Z 7c7f672362bd15c7420da781b5acdd40
 -Z 8583030a168d696cb55d61e60e6bf1f9
++Z 94dfedad60e693661825ed6ec7be94b2

diff --cc manifest.uuid
index 17c172b441d63bf35cfd60f054d4d5af73fbdb5d,67ab0b0648fabec68dcf349a4f8b65185c65244f..ad27fb1578188dbd347e2b5f0f86b695a059e9a9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 12a909fb3d80fcf84646644f2904be9827c643d0a98257448777c83b4f1dc90c
 -2b3241cf67c8eea761760ac27df7a136bcca2dca10c152a36b216c5dc88cdb53
++fd01e78827f22f8453ed11e5b0ec736302cc45465e5105241568eb6686ced882

diff --cc src/btree.c
index e9af501ff90b5206de6ed5d3bfba129bc04c7a7c,d3e43a0a3d4175632506818fc1cbdce372621e51..82ac7d98f6547de58abf38de0a78ad69529f47cc
--- 1/src/btree.c
--- 2/src/btree.c
+++ b/src/btree.c
@@@ -4451,7 -4451,7 +4451,7 @@@ int sqlite3BtreeCommitPhaseOne(Btree *p
        rc = btreeFixUnlocked(p);
      }
      if( rc==SQLITE_OK ){
-       rc = sqlite3PagerCommitPhaseOne(pBt->pPager, p, zMaster, 0);
 -      rc = sqlite3PagerCommitPhaseOne(pBt->pPager, zSuperJrnl, 0);
++      rc = sqlite3PagerCommitPhaseOne(pBt->pPager, p, zSuperJrnl, 0);
      }
      sqlite3BtreeLeave(p);
    }

diff --cc src/btree.h
Simple merge

diff --cc src/btreeInt.h
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
index 1a0cae522e05fa81a4e1feefb3d43faa8a775079,5261bf5053ad8d75496679d4b95eebbf967ce614..2f0cdc9d7b0a4929cae6804c63d630f55049707b
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -6530,8 -6521,7 +6525,8 @@@ void sqlite3PagerDropExclusiveLock(Page
  */
  int sqlite3PagerCommitPhaseOne(
    Pager *pPager,                  /* Pager object */
-   const char *zMaster,            /* If not NULL, the master journal name */
 +  Btree *pBtree,
+   const char *zSuper,            /* If not NULL, the super-journal name */
    int noSync                      /* True to omit the xSync on the db file */
  ){
    int rc = SQLITE_OK;             /* Return code */

diff --cc src/pager.h
index 7355bd6081f1ee07de2179b6d7e2e4a446d00574,c0a614783f339e711bbc7c3a65ce72c061d71bae..5057b9c976fb838ca9d1400baefafe64391f8be0
--- 1/src/pager.h
--- 2/src/pager.h
+++ b/src/pager.h
@@@ -42,6 -42,6 +42,8 @@@ typedef struct Pager Pager
  */
  typedef struct PgHdr DbPage;
  
++typedef struct Btree Btree;
++
  /*
  ** Page number PAGER_MJ_PGNO is never used in an SQLite database (it is
  ** reserved for working around a windows/posix incompatibility). It is
@@@ -161,9 -161,9 +163,9 @@@ void *sqlite3PagerGetExtra(DbPage *)
  /* Functions used to manage pager transactions and savepoints. */
  void sqlite3PagerPagecount(Pager*, int*);
  int sqlite3PagerBegin(Pager*, int exFlag, int);
- int sqlite3PagerCommitPhaseOne(Pager*,Btree*,const char *zMaster, int);
 -int sqlite3PagerCommitPhaseOne(Pager*,const char *zSuper, int);
++int sqlite3PagerCommitPhaseOne(Pager*,Btree*,const char *zSuper, int);
  int sqlite3PagerExclusiveLock(Pager*, DbPage *pPage1, Pgno*);
- int sqlite3PagerSync(Pager *pPager, const char *zMaster);
+ int sqlite3PagerSync(Pager *pPager, const char *zSuper);
  int sqlite3PagerCommitPhaseTwo(Pager*);
  int sqlite3PagerRollback(Pager*);
  int sqlite3PagerOpenSavepoint(Pager *pPager, int n);

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/wherecode.c
Simple merge