Merge recent enhancements from trunk.

FossilOrigin-Name: 000f4398db2753e2d6432735421e43b296cd4f9da8b9b51324e75eaa6616189c

diff --cc Makefile.in
Simple merge

diff --cc manifest
index e2393343d95354745f44a152ed5a57a96ac73714,bb4a5cfc1d40fab6056687f78664e18c9f56207b..19bfe81082f0ca78bcd5d199b7ade34f752ea931
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,12 +1,12 @@@
- C Merge\srecent\schanges\sfrom\strunk.
- D 2019-03-01T21:37:52.207
 -C Enhance\sthe\sVACUUM\sINTO\scommand\sso\sthat\sit\sworks\son\sread-only\sdatabases.
 -D 2019-03-19T20:42:42.516
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2019-03-19T20:48:10.102
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in d7de70a6d19d28154eb4f787e0839ede3748b797c4d83ebfdda356fbbbef1ce5
+ F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 236d2739dc3e823c3c909bca2d6cef93009bafbefd7018a8f3281074ecb92954
++F Makefile.in 966b6c7401c55db449ef54d55ed37f01de002be0257355dded97b98d51358f88
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
- F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
+ F README.md ebcdb6d5656020ef5ca37a6fc1ad89b4c80560ea33a3d70c250f9b845cf9da62
  F VERSION 288d756b1b7be03ecdbf1795c23af2c8425f2e46ba6979a14ef53360308f080d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -459,9 -457,9 +460,9 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 847c6367329a41ccf34bdaa3b5c3c9edae3839b65bb82a240ba1295ea11f2d6b
 -F src/btree.c a4e19b72925f65b421729c87fefe904a625dc0919491cd4ece9d230987f60400
++F src/btree.c 116deec8f08c188fdddd2a78576b4889f25f873db1be34168c1d98bbed1695ef
  F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
 -F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 +F src/btreeInt.h d3250a991da485bf4a1b607ad7d7db0c28c1ef9ddf0e716ea60e061c7d6c30b6
  F src/build.c 3acec29b23948042173301a8befebae01a98344debf66cbd4467c8b9077707b8
  F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -502,11 -500,11 +503,11 @@@ F src/os.c 4c1e6111a933d8167f4b4f38d3b3
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c b1ebd1705bb67d5bdb4633ee8ca0854fa2ff9026cd3ac00baa0aea20a34f6bd4
 -F src/os_unix.c f6e91b8fd82af7afbfd073c4974ad6cdb8e62d9f65ceddb45167835a0567fdc0
 -F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
++F src/os_unix.c 21faa3e6e4183c48756a8dab6f8f6d017b24e636c3266ebc3a973b64cc00734a
 +F src/os_win.c 340cb5909334c4ba748987dff2510498e3885bb24c2d9c7632794ed31279f0b5
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c cfa8292f24221223dec94d49b28ed63baea249637acb28dc3701d4b064c10ac1
 -F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
 -F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
++F src/pager.c 17ac3113571597edc8b75fd4f890851274cd2581759d611c80dd6b19972e3b4e
 +F src/pager.h 0acf77fd717a46c304f52405e19a550101a9efda29154af00d34eedcb7f1d50b
  F src/parse.y 741a270b7f2f85bc5d026d06fb5a9ccba5335304ff2831e1cb44b36cd0da6006
  F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -519,17 -517,16 +520,17 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c 09419ad5c432190b69be7c0c326e03abb548a97c2c50675b81b459e1b382d1d2
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
- F src/shell.c.in 249c0bf34f7ce272cb17162c297c45ab674a52a5d85193a86191f131196de47f
- F src/sqlite.h.in 2e2a6e7d067cc82a18aa73955daf70770d42f482589a14c7d246c325edc8125d
+ F src/shell.c.in 01c0cc01391d00d247fdf640052d38c267fc16d975bc4f3154a02277c232dbeb
 -F src/sqlite.h.in e33a4df7e32d742aac29623b38a1edd7e07a2b964a5d0257e2923c8a724faddc
++F src/sqlite.h.in 9d8c90ad387bca9755acd897bf6e1074e62aba4e0d383700010a644d0d8b99b3
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 -F src/sqliteInt.h f253c4ec15e577a293a462e5049f8ea1d0c7a31819b3a88acdd24698df8f4d0b
 +F src/sqliteInt.h 3e3612cd37891a183572300c5bc65cb03f1fab57b83d278b484e88a49073e262
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
  F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424
- F src/test1.c 6246552d6ca220dd33300747d0b2b1d349cf0ce536ed14c3c7de07782b36bb56
 -F src/test1.c cfb303eeddd3670409af6b58d2ddb928b8e9e70822d681d3df88dfaabb7bea6a
++F src/test1.c 262cb0aa84115912ce372d5f329c868bc45692a8a7d34b09b0c62ea99607696b
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -589,12 -586,12 +590,12 @@@ F src/update.c 0b973357d88092140531e07f
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
- F src/vacuum.c a9f389f41556c0ec310bc9169dc9476603c30a0a913ad92bfbc75c86886967ca
+ F src/vacuum.c 532553ee1d47f69c1198858107b1f3af3d16af25f2ab4ce3b1263d9e333f26e2
 -F src/vdbe.c f1e7b5320df80ff58c67176e35cb48062cbda2a9c9811f11db5faa48071d3fe4
 +F src/vdbe.c 52a36c078e8835c218a653c816b4b7cfe6873f7f8517e0159135363c4c3ee57c
  F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
  F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
- F src/vdbeapi.c c32f0cbed60cf0031d29283fc1e34eba6b855c3650ff4cdedce2c92ba806a986
- F src/vdbeaux.c 4fa28b32452f6197dba7c8780dde11576b9a6d8ce6f35adbb69efc3e7d37fa0c
 -F src/vdbeapi.c 7a052df80d7e2e55382076174633e888f21fe200feb5d49b1b441b4c38ab851a
++F src/vdbeapi.c 0f255b5e2821dffe923f1107746724e73b7c92df606b237383530c1be21cf2ad
+ F src/vdbeaux.c 7aa412e7e56eb53649d87766f3064994a31991ee2b2716bf8c3129fa15cc7653
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 3e89e087df928eba80e520824078dc563c579a0848b1557ac36845ec14392923
  F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f
@@@ -606,10 -603,10 +607,10 @@@ F src/wal.h bc4bdd9ee970c9d62197fa4139d
  F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
  F src/where.c 8a207cb2ca6b99e1edb1e4bbff9b0504385a759cbf66180d1deb34d80ca4b799
  F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
- F src/wherecode.c ce7b21e1be2b981d62683fc59c4ca73a04a7ff2f1ebec23d41baf2da2349afd6
- F src/whereexpr.c 36b47f7261d6b6f1a72d774c113b74beddf6745aba1018e64b196e29db233442
+ F src/wherecode.c 6fa4056c5ce019e4a8af33795906340176813cb3c1236f4b7b08df76a1b6287b
+ F src/whereexpr.c 90859652920f153d2c03f075488744be2926625ebd36911bcbcb17d0d29c891c
  F src/window.c df2456386e0b1553a8d1fcf3a0ddc4c058fe2c650ea8c74b6bf8862082ddafc9
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1124,14 -1120,14 +1125,14 @@@ F test/mallocJ.test b5d1839da331d96223e
  F test/mallocK.test 1f4b5efbf61715ab79b20b38739ff4b3d110ceb53f54e5db6da1f01c083707ab
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
  F test/mallocM.test 78bbe9d3da84a5c679123cdb40d7b2010b18fc46e13897e4f253c6ba6fbff134
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
  F test/malloctraceviewer.tcl b7a54595270c1d201abf1c3f3d461f27eaf24cdef623ad08a0fe5e411264c8a9
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
- F test/memdb1.test 0632e6ea56c48e3c6e9b0c73e120310bad8f93762543f809e267888f5a37943f
+ F test/memdb1.test 86fe8f259c5aa0b3118cf78a5a895882c4f398497ad5ea5d08f6604145eac685
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 +F test/memsubsys1.test 21f6e0e93302665caa03f37bf832afa1e8dde768d3f5547a5c59a03655d3bfaa
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 6751e87b409fe11b02e70a306d846fa544e25a41
  F test/minmax2.test dae92964ac87c1d2ef978c582e81a95e11c00f1cbef68980bfb2abaf10315063
@@@ -1285,8 -1281,8 +1286,8 @@@ F test/selectG.test 089f7d3d7e6db91566f
  F test/server1.test c2b00864514a68a0e6fd518659dc95d0050307a357a08969872bef027d785dc4
  F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
  F test/sessionfuzz-data1.db 1f8d5def831f19b1c74571037f0d53a588ea49a6c4ca2a028fc0c27ef896dbcb
- F test/sessionfuzz.c b0fcdcf757451957e17396a3af5171f1fdf9b2babc81da9fa35675df46c4729a
+ F test/sessionfuzz.c be9c4d4afd359ce80024d8b541b9b8a880510aef5cf263df56fc0e9b947727f1
 -F test/shared.test 1826673eb5eb745fb91a3bdac99a7737057742ae38dcb0fe076a384d6727578b
 +F test/shared.test ccc380a78e84972f5181a4f3ab02484e482f24160e496e653bede72669d2f72d
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
  F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
@@@ -1810,7 -1807,7 +1812,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 e64ded7b0478e96645ac7d8f36494244c972f85b12bb98b9db2655f142d1dc45 f5732f4caf7a37a6445c61ae0d0ac14cc9deb897376e73aa36a1ead025b92c69
- R cfdb503da7733676fa5c293f262a1ada
 -P d5acf3af65f9608d4096b9b78289d84b21cd1ea463457f858ffeb20d5bd5d123
 -R f00f2011633eed78de2ba493a3b1eac3
++P f270245a7b7b7d21a5f8d2a07eef0e5a56d15fb0c69024c666b047c3f3eb0eb9 55be6d0a9fa8a64b9c9c5ed51a2b9144304f7f0870a13b92d5864ac4d54491b6
++R 77db5f824b024005e46f779795cb2c27
  U drh
- Z b034b66a0016c793ba46a8e0777f67f7
 -Z 1def333ee1f2c7ed9dc916a2f0ad220f
++Z 49218da2c7773d7996fac34b5766d1d9

diff --cc manifest.uuid
index af454798e611a7b4efe7299e274070b5482c989c,07b1a6aaa5e300d90ec66e6c8eb12dfc078b9f3c..4a24bb9327bf09b84ef67a3ada6f25994d31cf27
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f270245a7b7b7d21a5f8d2a07eef0e5a56d15fb0c69024c666b047c3f3eb0eb9
 -55be6d0a9fa8a64b9c9c5ed51a2b9144304f7f0870a13b92d5864ac4d54491b6
++000f4398db2753e2d6432735421e43b296cd4f9da8b9b51324e75eaa6616189c

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/pager.c
Simple merge

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

diff --cc src/test1.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge