Merge the latest enhancements and fixes from trunk.

FossilOrigin-Name: bf20d4ffcb7b27b519502e2986cd0eb1d34d5fd273752fb27de9cdab75772acd

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 22a5c5e789cdf9985772a2c8ef08a86ad726497e,867f00809cfb12566135e9670d9a03dafd94b76a..5ac993e83bb84aa7c6b5589eccf0c7ed474c17de
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Add\sthe\sbgckpt.c\sextension\sto\sMakefile.in\sand\sMakefile.msc.
- D 2019-03-08T15:39:24.036
 -C Add\snew\stest\scases\sin\stest/fuzzdata8.db
 -D 2019-03-08T14:07:15.140
++C Merge\sthe\slatest\senhancements\sand\sfixes\sfrom\strunk.
++D 2019-03-08T15:57:31.459
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 903e48404f86dea5701c47f326933e4c846f68f35b22ecd349bddba80bbf8a94
 -F Makefile.in 1ad7263f38329c0ecea543c80f30af839ee714ea77fc391bf1a3fbb919a5b6b5
++F Makefile.in 66810b3d52e54518bb167571f3062c9e81ccd7b5ad286b22b328f73a5b7d8c2e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 366f2446655bc49eabcfb1a042e1e3d317fd05441f36ab9ddc0ad16e46de2388
 -F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
++F Makefile.msc 2898744d5431972b298938d60ae8f58ad29dbff64229205806e7bb5ded81ba6c
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
- F VERSION 453e2f4529ca208196d5567db28d549d7151f79efd33f6e6cfe6e613e583a0be
+ F VERSION 288d756b1b7be03ecdbf1795c23af2c8425f2e46ba6979a14ef53360308f080d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -273,30 -273,32 +274,33 @@@ F ext/lsm1/test/lsm1_common.tcl 5ed4bab
  F ext/lsm1/test/lsm1_simple.test ca949efefa102f4644231dcd9291d8cda7699a4ce1006b26e0e3fcb72233f422
  F ext/lsm1/tool/mklsm1c.tcl f31561bbee5349f0a554d1ad7236ac1991fc09176626f529f6078e07335398b0
  F ext/misc/README.md d6dd0fe1d8af77040216798a6a2b0c46c73054d2f0ea544fbbcdccf6f238c240
- F ext/misc/amatch.c c0a6a807a553eaa220bf69fca0353cd1587a3bfb3d2224fa425e3e6efcacc98a
+ F ext/misc/amatch.c cc9835931fbe46f9c6b8dbb51779c16f169bee50ae372a20532ff5154ebaf5b1
  F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
  F ext/misc/appendvfs.c 3777f22ec1057dc4e5fd89f2fbddcc7a29fbeef1ad038c736c54411bb1967af7
 +F ext/misc/bgckpt.c 49ae19aa03e6da393db5d17da256374d4c4d36889fdd89d6e4bc93aca2b752e6
  F ext/misc/btreeinfo.c 4f0ebf278f46e68e6306c667917766cebc5550fd35d5de17847988e22892d4d2
  F ext/misc/carray.c ed96c218ea940b85c9a274c4d9c59fe9491c299147a38a8bba537687bd6c6005
- F ext/misc/closure.c 9f8fa11aa6c6e2f6d7296ffa88f103df4b46abd9602bcab3ea2f8fc24f334f63
+ F ext/misc/closure.c 037d055c5a4880d41607a3ea44037f655b5e8ac1bdce305ec497903fd2646960
  F ext/misc/completion.c cec672d40604075bb341a7f11ac48393efdcd90a979269b8fe7977ea62d0547f
  F ext/misc/compress.c dd4f8a6d0baccff3c694757db5b430f3bbd821d8686d1fc24df55cf9f035b189
- F ext/misc/csv.c a8e779a3a0039abecddc6784095cc875d820ea65dcda158daa13e6b43d966e0f
- F ext/misc/dbdump.c 12389a10c410fadf1e68eeb382def92d5a7fa9ce7cce4fb86a736fa2bac1000a
- F ext/misc/eval.c 6ea9b22a5fa0dd973b67ca4e53555be177bc0b7b263aadf1024429457c82c0e3
+ F ext/misc/csv.c 7f047aeb68f5802e7ce6639292095d622a488bb43526ed04810e0649faa71ceb
+ F ext/misc/dbdump.c baf6e37447c9d6968417b1cd34cbedb0b0ab3f91b5329501d8a8d5be3287c336
+ F ext/misc/eval.c 4b4757592d00fd32e44c7a067e6a0e4839c81a4d57abc4131ee7806d1be3104e
  F ext/misc/explain.c d5c12962d79913ef774b297006872af1fccda388f61a11d37758f9179a09551f
- F ext/misc/fileio.c e3153b04433897a18a3d17185845f286892e96fdf87f4301290d09c36ae1759f
- F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
+ F ext/misc/fileio.c e7864c391e14ccaf73ee4b22f5a55c1eb40ecc93a7f5ee77a1b41b87367ec7ae
+ F ext/misc/fossildelta.c 910510968a30ab77b8ac1a27931f2cb834e9db9fd5ab122f53b6045b4315665d
+ F ext/misc/fuzzer.c 9e79c337faffdd4c5fe4485467537438359b43e0858a40038d4300b894ff553f
  F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
- F ext/misc/json1.c 3f017d2659e531d021d015ec5d69ea0b1c71f2e15bf9768b1e149fcdf6c3e0b1
- F ext/misc/memstat.c 941928c6104d8ed569a6c47caa756dc78b8091f7a15f87d3004f3b1e576b10da
+ F ext/misc/json1.c 8af4672f43634257dbcfdb4515b4070325463d67c6968b4be1bd414de28d4d58
+ F ext/misc/memstat.c 3017a0832c645c0f8c773435620d663855f04690172316bd127270d1a7523d4d
+ F ext/misc/memtrace.c 7c0d115d2ef716ad0ba632c91e05bd119cb16c1aedf3bec9f06196ead2d5537b
  F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
- F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
- F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
+ F ext/misc/mmapwarm.c 8c5fe90d807a23e44a8b93e96e8b812b19b300d5fd8c1d40a4fd1d8224e33f46
+ F ext/misc/nextchar.c 279f80fe8ef5ba413242e2704e246503ac601f005eefb180d19e6c920338a0ba
  F ext/misc/normalize.c b4290464f542bae7a97b43f15bd197949b833ffd668b7c313631bd5d4610212c
- F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
- F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4
+ F ext/misc/percentile.c 148dd07286b16e50f232bb638a47850085ad37d51f270429905bd865e595d1ca
+ F ext/misc/prefixes.c 7be86d17525cfae6ed462fc3c519efc44488ac329890f77491c8f82871f57e17
+ F ext/misc/regexp.c 79345bf03496155a640ee0300d3307296761cebb5e115b4e342cc2fb5861ec10
  F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
  F ext/misc/rot13.c 540a169cb0d74f15522a8930b0cccdcb37a4fd071d219a5a083a319fc6e8db77
  F ext/misc/scrub.c db9fff56fed322ca587d73727c6021b11ae79ce3f31b389e1d82891d144f22ad
@@@ -434,7 -437,7 +439,7 @@@ F ext/userauth/userauth.c f81aa5a3ecacf
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 1d1bea633efb9c22ab014aaffbd95efbd40f93266d294e4cabead7478c569ec9
 -F main.mk 3930eb2fcbebe49ab7408f6fef3baa8c4bf3c84540f9f29dfe849bf561ff6e51
++F main.mk 1e9231ef6493eb108d49d854cf86421435e0c0517ac5bbe76c2a1f949b978021
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -453,10 -456,10 +458,10 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 8e21892e5d79948dc62128878a11ede1865121701722031a6c578018ef274a8f
- F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
- F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
- F src/build.c 5ca38181e826bcc35e0176c31a691d897ed0cc708fc935fd51e8023705cdcf1a
 -F src/btree.c 51ff9c432f55f7fb8dca32d96707bc191327c1e29b1b83769d3ff6486df3948b
++F src/btree.c 7e3d0fde47b678d52694cfc6f9889c34d3a7f04577b20984c53795abe0cb8c0d
+ F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
+ F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
+ F src/build.c 3acec29b23948042173301a8befebae01a98344debf66cbd4467c8b9077707b8
  F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
@@@ -496,28 -499,28 +501,28 @@@ F src/os.c 8aeb0b0f40f8f5b0da03fe497066
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c f6e91b8fd82af7afbfd073c4974ad6cdb8e62d9f65ceddb45167835a0567fdc0
+ F src/os_unix.c 2b9604eb5c12f40a0613e832b6267f5814f84479d570d482ba6f98d7affa7c1c
  F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c dc6d0acb3f89b4dcb801c86a0e722c1bde116e058c7216ff74341812a38bbdd9
 -F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
 -F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
++F src/pager.c 3469df53e0d6acd4f40d77f1f414079e1c0b17e5ca2a782e7ccd91262a8ce67e
 +F src/pager.h 3abf6d65199fd0680b26a047c6167a96a4d6ead7535e02522b79f0fb27a3edec
- F src/parse.y a3c0db595bc642c6ee1d72869842f7f5b0b6ebeb91c21d0a7cba631d27e7afbd
+ F src/parse.y 741a270b7f2f85bc5d026d06fb5a9ccba5335304ff2831e1cb44b36cd0da6006
  F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
- F src/pcache1.c ddc9fc7d9861cf3a1f30660264b76b1ae9e1dce5dbba085cf001d5cb6b41cf8c
- F src/pragma.c c1bfbee754da581ab1f1c299d0522ed1e52e265f1100cad14be546e6d055e3cd
- F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13
- F src/prepare.c d0918fb8d00b1ebf19655e7f3d28464b3fc3c43c16d36dd06092de02244a5180
- F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381
+ F src/pcache1.c a72804486dfa8e4b6bc30d666c97ecf1155f91a4351fc6e48ea4097e4eb304fb
 -F src/pragma.c af67dedaad8bafe9a5f9adcec32a0da6dd118617dd8220ad1d118f5a6bf83a02
++F src/pragma.c 4113abface06219131ada1f98dc2a0860f0f217f9608e1352f4504191064b355
+ F src/pragma.h a776bb9c915207e9d1117b5754743ddf1bf6a39cc092a4a44e74e6cb5fab1177
+ F src/prepare.c 78027c6231fbb19ca186a5f5f0c0a1375d9c2cec0655273f9bd90d9ff74a34b3
+ F src/printf.c 93a3d539019264683a444bc043c875e9a6cca43fe935ae7bf6cfff0af3bba118
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 5f2f987aacba7548d10781f808e1b933f80abe0b6bc8e9922bc18b1d1faba339
+ F src/resolve.c 09419ad5c432190b69be7c0c326e03abb548a97c2c50675b81b459e1b382d1d2
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c 4b0be1bfd2d8668e2711f877682361e06b412c53ce7a56303f1f6978ec33eca8
- F src/shell.c.in 207da30342db0b6fac8b2487abd60b059a5ea80cc9494bd1db76a1dd4aae7cca
- F src/sqlite.h.in b54cd42d2f3b739a00de540cafe2dcd0de3b8e1748a2db33a68def487e9e602f
+ F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
+ F src/shell.c.in 01c0cc01391d00d247fdf640052d38c267fc16d975bc4f3154a02277c232dbeb
+ F src/sqlite.h.in 02be315feaf20c06028aacf3b032b5e7211e9aae066284eef77b081646b43ea0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h a86007d427b9a7b97e9f1e1e0911eba3f70e1a3764a0a0aff0efd4d7bb029001
+ F src/sqliteInt.h f253c4ec15e577a293a462e5049f8ea1d0c7a31819b3a88acdd24698df8f4d0b
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -575,33 -578,33 +580,33 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c c8af4feebd8bf5a4d60a14018d91f61013f658ec864dfce7661bae73d86b3191
+ F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
  F src/treeview.c c6ff90da4cc1813ff2d9bb11f17d4d927db62c47e552faa1835edc47269d753d
- F src/trigger.c 77546bf525854aa4dc09f3a0450fa801c3e99d5f13a3eb2efd07bfe521e3b5d6
- F src/update.c 4e630e47852e206d0b29ec63ea0402e0b7ba328a1c19dd645ae8ac7bd0a378cf
+ F src/trigger.c bb034c08eca111e66a19cda045903a12547c1be2294b5570d794b869d9c44a73
+ F src/update.c 0b973357d88092140531e07ff641139c26fb4380b0b9f5ed98c5f7691b4604d1
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
- F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
+ F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
  F src/vacuum.c a9f389f41556c0ec310bc9169dc9476603c30a0a913ad92bfbc75c86886967ca
- F src/vdbe.c fd8590226303d749583da0ce413c620f07c9d89c6a1f67c28fffecbe96e311a9
 -F src/vdbe.c f1e7b5320df80ff58c67176e35cb48062cbda2a9c9811f11db5faa48071d3fe4
++F src/vdbe.c 9043f11662191840ed2115f42e6c48af3c7b08958d2846c99f014ca348c099f2
  F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
  F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
- F src/vdbeapi.c 57a2d794a8833f269b878dbc24e955369bdb379af6c4e93ebc5ce1a20fa3daf4
- F src/vdbeaux.c b230f12642040c5ede19f092d9ad7510f75add84888e66a00108948dec574fd2
+ F src/vdbeapi.c 7a052df80d7e2e55382076174633e888f21fe200feb5d49b1b441b4c38ab851a
+ F src/vdbeaux.c 4fa28b32452f6197dba7c8780dde11576b9a6d8ce6f35adbb69efc3e7d37fa0c
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
- F src/vdbemem.c 7b3305bc4a5139f4536ac9b5f61da0f915e49d2e3fdfa87dfdfa9d7aba8bc1e9
+ F src/vdbemem.c 3e89e087df928eba80e520824078dc563c579a0848b1557ac36845ec14392923
  F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f
  F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
- F src/vtab.c 70188a745dc4e57d26e942681ff4b2912b7c8249ad5de3f60f0677b4337bcfaa
+ F src/vtab.c 2462b7d6fd72b0b916477f5ef210ee49ab58cec195483ebdac0c8c5e3ec42cab
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 3f4f653daf234fe713edbcbca3fec2350417d159d28801feabc702a22c4e213f
 -F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 +F src/wal.c 8bfa18a1c5e04a21a8cb142cdb7f8236ad32300a2298565b6fe1cdd15beee3a6
 +F src/wal.h d2a69695c84137f76e19a247a342cb02ab0131001b6f58153d94b71195bbd84d
- F src/walker.c fb94aadc9099ff9c6506d0a8b88d51266005bcaa265403f3d7caf732a562eb66
- F src/where.c 981412c27abb9378d3024eae6f3040abd3c16db722f5ef8a7d613141ea2aea78
+ F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
+ F src/where.c 8a207cb2ca6b99e1edb1e4bbff9b0504385a759cbf66180d1deb34d80ca4b799
  F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
- F src/wherecode.c 89d2ec668aec884dfa7ac500c6744e42ec0590fcd72fb740a8b48326a8412811
+ F src/wherecode.c ce7b21e1be2b981d62683fc59c4ca73a04a7ff2f1ebec23d41baf2da2349afd6
  F src/whereexpr.c 36b47f7261d6b6f1a72d774c113b74beddf6745aba1018e64b196e29db233442
- F src/window.c f4a9ac8396395a9e281e182dd32fc9b3b19f6762a9eef468137369def3ad9a2c
+ F src/window.c df2456386e0b1553a8d1fcf3a0ddc4c058fe2c650ea8c74b6bf8862082ddafc9
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -743,10 -747,10 +749,10 @@@ F test/corrupt6.test fc6a891716139665da
  F test/corrupt7.test b036f94bda4b0b23a2919bf717046ce9ecca4543
  F test/corrupt8.test 2399dfe40d2c0c63af86706e30f3e6302a8d0516
  F test/corrupt9.test 730a3db08d4ab9aa43392ea30d9c2b4879cbff85
 -F test/corruptA.test 112f4b2ae0b95ebf3ea63718642fb969a93acea557ace3a307234d19c245989b
 +F test/corruptA.test 56e8f321adaf3411960e9d2c7136669d8e1a91cbde6cf401ea84e6d6c7ccbe10
  F test/corruptB.test 73a8d6c0b9833697ecf16b63e3c5c05c945b5dec
  F test/corruptC.test 138ecb02188ed1a719b533d4a139568204039f72f00e07a8d30d920bd83122db
- F test/corruptD.test b3c205fac7952b1de645ce44bb02335cd9e3e040
+ F test/corruptD.test 33a37ce3ed56a20093ceee778cd2d7109c7085a59f3213d2baede11d952e8e50
  F test/corruptE.test 82ccf4f8f543fdbedd4aa42c709cb077f7374c62
  F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
  F test/corruptG.test adf79b669cbfd19e28c8191a610d083ae53a6d51
@@@ -1189,7 -1196,7 +1198,7 @@@ F test/parser1.test 6ccdf5e459a5dc4673d
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 027d8460ba7a2e7b1332388c81fc896f713e1bba57c7157a8278b6bdfd321111
 -F test/permutations.test 52d2c37fe8cc07ec7362024c214b04bb69432995b3a984a3fbabc60fa6ada3ee
++F test/permutations.test c820cf868e8b3b922545797fb54ed150e771e28b64724990e1127cbd00b8b756
  F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
  F test/pragma.test c267bf02742c823a191960895b3d52933cebd7beee26757d1ed694f213fcd867
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@@ -1240,10 -1248,10 +1250,10 @@@ F test/savepoint.test ea1a6c08454e1a4ed
  F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
  F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
 -F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
 +F test/savepoint6.test 48a645a7bb3a59a6fcf06a7364cfe5b655c336760de39068f7c241b0fc80d963
  F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
  F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
- F test/scanstatus.test d14842d0a2757ee059bcffa365746453d60952ba1077980c9a348a9fefbd232a
+ F test/scanstatus.test 874e35011779b07725a47dbf1dd6282b0ca04af7e028fb0b534ee544b571be42
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
  F test/schema3.test 1bc1008e1f8cb5654b248c55f27249366eb7ed38
@@@ -1366,7 -1374,7 +1376,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl f93080be43af7d7687e5817c62b4097e06ea2ed0f1af3ba773675a9d2f90e971
 -F test/tester.tcl 499a5086815aa416d971ff438d7425c64f41ed3233251db4836d270f9a6671e8
++F test/tester.tcl 71725eee35ddc5d2bf3112c1caa52b05ec73dbb7b596bb064751c7e9872dea40
  F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1603,18 -1611,8 +1613,18 @@@ F test/vtab_alter.test 736e66fb5ec7b4fe
  F test/vtab_err.test dcc8b7b9cb67522b3fe7a272c73856829dae4ab7fdb30399aea1b6981bda2b65
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
  F test/vtabdrop.test 65d4cf6722972e5499bdaf0c0d70ee3b8133944a4e4bc31862563f32a7edca12
 -F test/wal.test cdf0ca6cc0447520d19ef1c83287824ebeb3e82d75af856511ba96841a79fc9b
 +F test/wal.test a233cd4733928a5aaef24738727c4094d561ea68089f93cccd1f6e9dec610212
  F test/wal2.test 155b9efa999bdb38ce1cd729b9a4fcdbffd6b88be27f039bad1d2929d287d918
- F test/wal2recover2.test d473784bc72ee70438d1aa1cbe449fb322d7e52e8eaa256135fb3182c66b1c78
 +F test/wal2big.test 0b4ec526f9ca4bbabc355042c38045ae2e253fb46eb327bb7693d0122bc6968b
 +F test/wal2fault.test 2e8e60cacd5bcd451618aeffd05f676894d17202d3e2986e288d36e2c5993249
 +F test/wal2lock.test 0ef98d72dc6bcf7711dedd684760488400d9a9a6eec0dc5d3822060437793552
 +F test/wal2recover.test ba8f4bc9397c838734619f9e759bd98b00e355347b3cf80a2e677610d231d5d8
++F test/wal2recover2.test 0c46afc759e4392a3c12fba17432b880c93a13bf4246d1be5101b00bae4c5f01
 +F test/wal2rewrite.test 6ca6f631ffcf871240beab5f02608913fd075c6d0d31310b026c8383c65c9f9c
 +F test/wal2rollback.test 23adc4a099b23f6aaea8b04fdca1c35861d887dd80f8be7da2d5273eb777e428
 +F test/wal2savepoint.test 2c82bd6a6ee5066c156040d2e9c2415646fcf96116ae7ad127eaf0c0b4a85f22
 +F test/wal2simple.test 96206c98bf64ab20ec00a1c0f6c709e258b98b39f2149889361f31966ce5a703
 +F test/wal2snapshot.test 7a5f4629a3c43a43c3440b8b2ea9f07de91a46b0b9eea5f08f62b5bf5b6468df
  F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
@@@ -1807,7 -1806,7 +1818,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 b495dce153f7f886f3dba09593f29ce2375718bf6508f2cfffd1af8071a995ae
- R 097e453c6dbf0709087c24fac1c6c3b8
 -P 174da3c32c9caebd642c31cb594597ccd5bb2a7fc501b1f49aef0b7b4765bfca
 -R ad8e3579c2cae43b005671c858b5c8da
++P 3712d625d625f962c627c74222467ad4858be46feda570449f9cb640549c9ddd 97bdc090f30610cc5dd29101452d1647550387f9c6f742e50f1e07c3cf68a147
++R b8ed3ee6ce35b69d0b38fb468fd57421
  U drh
- Z 49a629fd05fa20141267e72d5e7eee4a
 -Z 7c4c442c34b6395bc654161f597d6654
++Z 8e2aced8e0df079655bef1815a75a319

diff --cc manifest.uuid
index c6932ae30ea1e59f4fdaac6e0f35fc471604e895,6f5c8a7a1ea8bbf0b7c6445c362ff78839552176..dbe27a9c5a42fa381eeacc235b4f51ba25f126c9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3712d625d625f962c627c74222467ad4858be46feda570449f9cb640549c9ddd
 -97bdc090f30610cc5dd29101452d1647550387f9c6f742e50f1e07c3cf68a147
++bf20d4ffcb7b27b519502e2986cd0eb1d34d5fd273752fb27de9cdab75772acd

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal2recover2.test
index 3665e78b20f6bda35dfd01e7b8bdbda649dfe20b,0000000000000000000000000000000000000000..c3cadf8825af296a60a58c29e47f0638a342f80b
mode 100644,000000..100644
--- 1/test/wal2recover2.test
--- /dev/null
+++ b/test/wal2recover2.test
@@@ -1,266 -1,0 +1,265 @@@
- } {1 {database disk image is malformed}}
 +# 2018 December 13
 +#
 +# The author disclaims copyright to this source code.  In place of
 +# a legal notice, here is a blessing:
 +#
 +#    May you do good and not evil.
 +#    May you find forgiveness for yourself and forgive others.
 +#    May you share freely, never taking more than you give.
 +#
 +#***********************************************************************
 +# This file implements regression tests for SQLite library.  The
 +# focus of this file is testing the operation of the library in
 +# "PRAGMA journal_mode=WAL2" mode.
 +#
 +
 +set testdir [file dirname $argv0]
 +source $testdir/tester.tcl
 +source $testdir/lock_common.tcl
 +source $testdir/malloc_common.tcl
 +source $testdir/wal_common.tcl
 +
 +set testprefix wal2recover2
 +ifcapable !wal {finish_test ; return }
 +
 +do_execsql_test 1.0 {
 +  CREATE TABLE t1(x);
 +  CREATE TABLE t2(x);
 +  WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<1500 )
 +    INSERT INTO t1 SELECT i FROM s;
 +  WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<1500 )
 +    INSERT INTO t2 SELECT i FROM s;
 +
 +  PRAGMA journal_mode = wal2;
 +  PRAGMA journal_size_limit = 10000;
 +} {wal2 10000}
 +
 +set ::L 1125750
 +set ::M 1126500
 +set ::H 1127250
 +
 +do_execsql_test 1.1 {
 +  UPDATE t1 SET x=x+1;
 +  UPDATE t2 SET x=x+1 WHERE rowid<=750;
 +
 +  SELECT sum(x) FROM t1;
 +  SELECT sum(x) FROM t2;
 +} [list $H $M]
 +
 +do_test 1.2 {
 +  list [file size test.db] [file size test.db-wal] [file size test.db-wal2]
 +} {31744 14704 7368}
 +
 +proc cksum {zIn data} {
 +  if {[string length $zIn]==0} {
 +    set s0 0
 +    set s1 0
 +  } else {
 +    set s0 [hexio_get_int [string range $zIn 0 7]]
 +    set s1 [hexio_get_int [string range $zIn 8 15]]
 +  }
 +  set n [expr [string length $data] / 8]
 +
 +  for {set i 0} {$i < $n} {incr i 2} {
 +    set x0 [hexio_get_int -l [string range $data [expr $i*8]   [expr $i*8+7]]]
 +    set x1 [hexio_get_int -l [string range $data [expr $i*8+8] [expr $i*8+8+7]]]
 +
 +    set s0 [expr ($s0 + $x0 + $s1) & 0xFFFFFFFF]
 +    set s1 [expr ($s1 + $x1 + $s0) & 0xFFFFFFFF]
 +  }
 +
 +  return "[hexio_render_int32 $s0][hexio_render_int32 $s1]"
 +}
 +
 +proc fix_wal_cksums {file} {
 +  # Fix the checksum on the wal header.
 +  set data [hexio_read $file 0 32]
 +  set cksum [cksum {} [string range $data 0 47]]
 +  set salt [hexio_read $file 16 8]
 +  hexio_write $file 24 $cksum
 +
 +  # Fix the checksums for all pages in the wal file.
 +  set pgsz [hexio_get_int [hexio_read $file 8 4]]
 +  set sz [file size $file]
 +  for {set off 32} {$off < $sz} {incr off [expr $pgsz+24]} {
 +    set e [hexio_read $file $off 8]
 +    set cksum [cksum $cksum $e]
 +
 +    set p [hexio_read $file [expr $off+24] $pgsz]
 +    set cksum [cksum $cksum $p]
 +
 +    hexio_write $file [expr $off+8] $salt
 +    hexio_write $file [expr $off+16] $cksum
 +  }
 +}
 +
 +proc wal_incr_hdrfield {file field} {
 +  switch -- $field {
 +    nCkpt { set offset 12 }
 +    salt0 { set offset 16 }
 +    salt1 { set offset 20 }
 +    default {
 +      error "unknown field $field - should be \"nCkpt\", \"salt0\" or \"salt1\""
 +    }
 +  }
 +
 +  # Increment the value in the wal header.
 +  set v [hexio_get_int [hexio_read $file $offset 4]]
 +  incr v
 +  hexio_write $file $offset [hexio_render_int32 $v]
 +  
 +  # Fix various checksums
 +  fix_wal_cksums $file
 +}
 +
 +proc wal_set_nckpt {file val} {
 +  # Increment the value in the wal header.
 +  hexio_write $file 12 [hexio_render_int32 $val]
 +  
 +  # Fix various checksums
 +  fix_wal_cksums $file
 +}
 +
 +proc wal_set_follow {file prevfile} {
 +  set pgsz [hexio_get_int [hexio_read $prevfile 8 4]]
 +  set sz [file size $prevfile]
 +  set cksum [hexio_read $prevfile [expr $sz-$pgsz-8] 8]
 +
 +  hexio_write $file 16 $cksum
 +  fix_wal_cksums $file
 +}
 +
 +foreach {tn file field} {
 +  1 test.db2-wal    salt0
 +  2 test.db2-wal    salt1
 +  3 test.db2-wal    nCkpt
 +  4 test.db2-wal2   salt0
 +  5 test.db2-wal2   salt1
 +  6 test.db2-wal2   nCkpt
 +} {
 +  do_test 1.3.$tn {
 +    forcecopy test.db test.db2
 +    forcecopy test.db-wal test.db2-wal
 +    forcecopy test.db-wal2 test.db2-wal2
 +    wal_incr_hdrfield $file $field
 +    sqlite3 db2 test.db2
 +    execsql {
 +      SELECT sum(x) FROM t1;
 +      SELECT sum(x) FROM t2;
 +    } db2
 +  } [list $H $L]
 +  db2 close
 +}
 +
 +do_test 1.4 {
 +  forcecopy test.db test.db2
 +  forcecopy test.db-wal2 test.db2-wal
 +  forcedelete test.db2-wal2
 +  sqlite3 db2 test.db2
 +  execsql {
 +    SELECT sum(x) FROM t1;
 +    SELECT sum(x) FROM t2;
 +  } db2
 +} [list $L $M]
 +
 +do_test 1.5 {
 +  forcecopy test.db test.db2
 +  forcecopy test.db-wal2 test.db2-wal
 +  forcecopy test.db-wal test.db2-wal2
 +  sqlite3 db2 test.db2
 +  execsql {
 +    SELECT sum(x) FROM t1;
 +    SELECT sum(x) FROM t2;
 +  } db2
 +} [list $H $M]
 +
 +foreach {tn file field} {
 +  1 test.db2-wal    salt0
 +  2 test.db2-wal    salt1
 +  3 test.db2-wal2   salt0
 +  4 test.db2-wal2   salt1
 +} {
 +  do_test 1.6.$tn {
 +    forcecopy test.db test.db2
 +    forcecopy test.db-wal2 test.db2-wal
 +    forcecopy test.db-wal test.db2-wal2
 +    wal_incr_hdrfield $file $field
 +    sqlite3 db2 test.db2
 +    execsql {
 +      SELECT sum(x) FROM t1;
 +      SELECT sum(x) FROM t2;
 +    } db2
 +  } [list $H $L]
 +  db2 close
 +}
 +
 +foreach {tn nCkpt1 nCkpt2 res} [list \
 +  1   2 1   "$H $M"                  \
 +  2   2 2   "$L $M"                  \
 +  3   3 1   "$H $L"                  \
 +  4   15 14 "$H $M"                  \
 +  5   0 15  "$H $M"                  \
 +  6   1 15  "$L $M"                  \
 +] {
 +  do_test 1.7.$tn {
 +    forcecopy test.db test.db2
 +    forcecopy test.db-wal2 test.db2-wal
 +    forcecopy test.db-wal test.db2-wal2
 +
 +    wal_set_nckpt test.db2-wal2 $nCkpt2
 +    wal_set_nckpt test.db2-wal  $nCkpt1
 +    wal_set_follow test.db2-wal test.db2-wal2
 +
 +
 +    sqlite3 db2 test.db2
 +    execsql {
 +      SELECT sum(x) FROM t1;
 +      SELECT sum(x) FROM t2;
 +    } db2
 +  } $res
 +  db2 close
 +}
 +
 +#-------------------------------------------------------------------------
 +reset_db
 +do_execsql_test 1.8.1 {
 +  PRAGMA autovacuum = 0;
 +  PRAGMA page_size = 4096;
 +  CREATE TABLE t1(x);
 +  CREATE TABLE t2(x);
 +  WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<1500 )
 +    INSERT INTO t1 SELECT i FROM s;
 +  WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<1500 )
 +    INSERT INTO t2 SELECT i FROM s;
 +
 +  PRAGMA journal_mode = wal2;
 +  PRAGMA journal_size_limit = 10000;
 +
 +  WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<1500 )
 +    INSERT INTO t2 SELECT i FROM s;
 +} {wal2 10000}
 +
 +do_test 1.8.2 {
 +  list [file size test.db-wal] [file size test.db-wal2]
 +} {24752 0}
 +
 +do_execsql_test 1.8.3 { PRAGMA user_version = 123 }
 +do_test 1.8.4 {
 +  list [file size test.db-wal] [file size test.db-wal2]
 +} {24752 4152}
 +
 +do_test 1.8.5 {
 +  hexio_write test.db-wal2 [expr 56+16] 0400
 +  fix_wal_cksums test.db-wal2
 +} {}
 +
 +do_test 1.8.6 {
 +  forcecopy test.db test.db2
 +  forcecopy test.db-wal test.db2-wal
 +  forcecopy test.db-wal2 test.db2-wal2
 +  sqlite3 db2 test.db2
 +  catchsql { SELECT * FROM sqlite_master } db2
- 
++} {1 {malformed database schema (?)}}
 +db2 close
 +
 +finish_test