Merge all the latest changes and enhancements from trunk.

FossilOrigin-Name: 521d5186b8258794b21aa63f81883475846cb7d26b3a1ae3c7c47cbb9602b426

diff --cc manifest
index a88b872cb711e14339a557b788b5ac1e82b77c00,f79652db9449bcb4eda2a99c5e11cb29928dd66b..49b6fd33d9d06c770e9d763e361f13387d5d3ddc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sfixes\sfrom\strunk.
- D 2019-04-02T01:00:48.980
 -C Add\sfurther\stest\scases\sto\simprove\sVDBE\sbranch\scoverage.
 -D 2019-04-04T20:55:37.217
++C Merge\sall\sthe\slatest\schanges\sand\senhancements\sfrom\strunk.
++D 2019-04-04T21:40:51.934
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -481,10 -478,10 +481,10 @@@ F src/hash.c a12580e143f10301ed5166ea49
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 4ce12b5ba3bcbfa17ec37ce960d499fc287b6289df2c00b31201f716a3c7df45
+ F src/insert.c bf4f96aaf23511b8abd2d55bf2117687f3d7111d5860110963189e66cfc7bdac
 -F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 +F src/legacy.c f69590f141eabd2dc787710264ccfa4374fac991ea1ca2120a2550c0ffe32afd
- F src/loadext.c e6f10875d52aca3b7e57ce1ec174aeafc9b6c00b43000cd30d791f9cb490b7a6
+ F src/loadext.c 22afc33c3a61b4fd80a60a54f1882688371e6bc64685df2696b008fce65a999c
 -F src/main.c 11714c8cefd458970cb1fd005251d0ad02ad69598893833b5564ffaaef192a1f
 +F src/main.c 377945d76c3bc876a867f7414f4168271ea67f45e85821d9f9ad15c3e4b1603b
  F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -504,29 -501,28 +504,29 @@@ 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 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 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
 -F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
 +F src/pager.c 17ac3113571597edc8b75fd4f890851274cd2581759d611c80dd6b19972e3b4e
 +F src/pager.h 0acf77fd717a46c304f52405e19a550101a9efda29154af00d34eedcb7f1d50b
- F src/parse.y a020386af1739371b2eafba077497aacf2a840d1a178508dc6f8c19448e42054
+ F src/parse.y 209b0e396a1bde1e4b515b86d00b5b1d3f6e13ba7edf3adb6acd41fa8560edf0
  F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 -F src/pcache1.c a72804486dfa8e4b6bc30d666c97ecf1155f91a4351fc6e48ea4097e4eb304fb
 -F src/pragma.c af67dedaad8bafe9a5f9adcec32a0da6dd118617dd8220ad1d118f5a6bf83a02
 +F src/pcache1.c 8035ab76e766c7b3dca88f568590c87e474aeddb2d07ef2598f4c5088093d609
 +F src/pragma.c a6ad736f960ab2bba79ce96c5d5a2f8f2e841258900d6a436565c14839f0fc08
  F src/pragma.h a776bb9c915207e9d1117b5754743ddf1bf6a39cc092a4a44e74e6cb5fab1177
 -F src/prepare.c 78027c6231fbb19ca186a5f5f0c0a1375d9c2cec0655273f9bd90d9ff74a34b3
 +F src/prepare.c 58a6ad1d4abf266f2ee6aa4fc35960459340f01a6b5dd9a2bb25a7c3c6c86f98
  F src/printf.c 93a3d539019264683a444bc043c875e9a6cca43fe935ae7bf6cfff0af3bba118
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
  F src/shell.c.in c1986496062f9dba4ed5b70db06b5e0f32e1954cdcfab0b30372c6c186796810
- F src/sqlite.h.in c7149aaff3233282962b5faa4cc5c935c41684737a575c0a267320538626db2d
 -F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
++F src/sqlite.h.in 039e1741797f8ecd72c9343667b74ae59e118c25ab04284aac4a8e5422fc5d1a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
- F src/sqliteInt.h 21566eeb79fcba9afc061b47ad94bc0a949c84d79bbc03a0689587c6c523395a
 -F src/sqliteInt.h f6a114e0c67a7082546a21fcbf64380e5e70004c1ff67b9d93d82a347aa86fb8
++F src/sqliteInt.h 93a1f09833350576e82f623c757df60e9a0ddc037d6c7ee7d2bb4ac017c798a0
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -592,11 -588,11 +592,11 @@@ F src/update.c 0b973357d88092140531e07f
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
- F src/vacuum.c 532553ee1d47f69c1198858107b1f3af3d16af25f2ab4ce3b1263d9e333f26e2
+ F src/vacuum.c 72690ccb6877a88f8473a893cf9f6d7592236f3eebfebfa840b19c708acde574
 -F src/vdbe.c 711ef421b3bb3db3b2476067b2dc3c71ef5844d9b1a723026578f89f6da621e8
 +F src/vdbe.c 694e81e248dd69f19e2395b79c642b3fd3b9bf662c2431852bfe5a675885a7ab
  F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
  F src/vdbeInt.h d0c78ec6ba57e438164c46ee8129ee00ccd898c472b27e325c9758eda533e37e
 -F src/vdbeapi.c a6e462bd7853e272cf614d6fbda7f3f20c89a2d255805855b32895a5983ddcec
 +F src/vdbeapi.c 6f93b0b5578b4fdc504fdd12d9f25a75ed9b2410c9413f5be93b5a9a60df057d
  F src/vdbeaux.c 7aa412e7e56eb53649d87766f3064994a31991ee2b2716bf8c3129fa15cc7653
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 6d67403debf6eb2b0c8d956ea09bb0ad79b4b45af2a7e2b2736894e703ae3286
@@@ -604,15 -600,15 +604,15 @@@ F src/vdbesort.c 90aad5a92608f2dd771c96
  F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
  F src/vtab.c 2462b7d6fd72b0b916477f5ef210ee49ab58cec195483ebdac0c8c5e3ec42cab
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c df8a22fe3693c30d4434f27c229bddb3dc85a3b7d2dc9609cf9f4741ead65b1c
 -F src/wal.c 8bf87820896453ee3cca75f3082c57d7d82643e46cc089775612b18453732c12
 -F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
++F src/wal.c f331eccd4ddca94d83da96f03b0fe07d8d202734980d675beb8be11dc5ab884e
 +F src/wal.h bc4bdd9ee970c9d62197fa4139d7782f4d96d75152d1e6d4ead4d45dd684187d
  F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
  F src/where.c ff2955dc2743c1af05ba5a8232ab72724d9a63b76dbee256368f40fd3ef82db5
  F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
  F src/wherecode.c 9572aab9eff42859a5f3e9b212f704521a84bf77e444217f0339d8b811e6333f
  F src/whereexpr.c 90859652920f153d2c03f075488744be2926625ebd36911bcbcb17d0d29c891c
- F src/window.c aefd7e4511a537ddae2d1206aa300167a2f9d04689ceb94ac32aabe7fe6e92bc
+ F src/window.c 038c248267e74ff70a2bb9b1884d40fd145c5183b017823ecb6cbb14bc781478
 -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
@@@ -829,10 -825,10 +829,10 @@@ F test/e_select2.test aceb80ab927d46fba
  F test/e_totalchanges.test b12ee5809d3e63aeb83238dd501a7bca7fd72c10
  F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
  F test/e_uri.test 47eeb2960e74613f0f8722b2f13aef08fde69daa16e5380ac93df84dac8b1f72
- F test/e_vacuum.test 44acfe525e01071ca50e76c68875db6fa084dd7743a3a16b5b503455539d03ca
+ F test/e_vacuum.test 0d8832a2ce92350db0d0cff47b419465fd9772562e1f77ff7d9478c07a4980d2
 -F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
 +F test/e_wal.test 95c21e45eefe4cc31e820f998b14f92d1cb3a1bf
  F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 -F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0
 +F test/e_walckpt.test 9f20ab843538484c57069074b126699266ee5521
  F test/e_walhook.test 01b494287ba9e60b70f6ebf3c6c62e0ffe01788e344a4846b08e5de0b344cb66
  F test/emptytable.test a38110becbdfa6325cd65cb588dca658cd885f62
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
@@@ -1206,10 -1201,10 +1206,10 @@@ F test/pcache2.test af7f3deb1a819f77a6d
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test b8f0da2f53ef1bd7ff149a140ee625aa7276c94ae15eb9acc2d8ed4af8f22b13
  F test/pg_common.tcl 4740dc35190d6acdab14c097783331361301ab504a94d948f6afbb56ce0a51e8
- F test/pragma.test 5f399fa2dabff786f109d923802b25e533dd99afb536618ef6b45d6ddae9e10f
 -F test/pragma.test cf066fe0f7f5d49f4758de4986407b8676c61aaa7871599340d64f42a8edc352
++F test/pragma.test 56043531b5a82d332d0ea37508bf15a2977d088751f83e191ae5ae9e0cf6e93a
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
 -F test/pragma4.test 52d8186f9e8d09b87189432cdd401dfa66d0b32445e837fa19046c8ae7621b0e
 +F test/pragma4.test e35e8bce8ce0e3790511b281a6d349998bb22b701bceb255b9c8aab402a5b652
  F test/pragma5.test 824ce6ced5d6b7ec71abe37fc6005ff836fe39d638273dc5192b39864b9ee983
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/prefixes.test b524a1c44bffec225b9aec98bd728480352aa8532ac4c15771fb85e8beef65d9
@@@ -1312,10 -1307,10 +1312,10 @@@ F test/shell8.test 96be02ea0c21f05b24c1
  F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
 +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 3ea1cccca8f1b0e1cf3e73a63b43dd796f34d4aaee815e641f0d2ebb3fa448d4
- F test/skipscan2.test ef143c6e4a5ba4f19c1d1e3f517811f7942bdf2142736cc568feb34e0b5fb763
+ F test/skipscan2.test 3eb703ce794f139e7b83567911046298bcde29606116727f9b700ce34f559d2d
  F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
  F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
  F test/skipscan6.test 0b4cd1b4ac9f84d91454df513c99a4932fa07e8f27b8049bea605068b3e34ac7
@@@ -1820,7 -1815,7 +1820,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 0b35aebbb316fb2849c3a6bb93ffa6300187d1dccbb162bdd00fde53eb61356e f7ba2daf91c96ba16958188d6084a0ff129310d348932de493d326f1d24679cd
- R 206b3d502105fb9da2ddab0c1a6f3b8b
 -P bf3cd9364fdfc951feb04f78728eb8e0dae12b3dc5702a36bb6e69c0abab8864
 -R 844ebba6c2187a1be3b2412d8e945ade
 -U dan
 -Z 5c8fb8091f9dc8e90ba082e00d6a8a31
++P 20372906cb236fde1cad0779217db408682a1f787d43ec7d2d3a5cc7d9f91ea3 51a95e52fc58d8be2c9c51576dff7258c705735b66d203948f80db017b4c10d2
++R e874826d2a474c79cf3dd866d37d4287
 +U drh
- Z 06b4aa78d804874754643cf0bd9e299d
++Z 01e2cbbe27db6816a166ca731a2c9b95

diff --cc manifest.uuid
index c89ef472305e0f5f9c432adfdc22a1896f2928ab,e369864d4c27f5cc62bf77b6329dbe534fbe878b..75724608e438d25ac5405437fc6f2b38a4cdf811
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 20372906cb236fde1cad0779217db408682a1f787d43ec7d2d3a5cc7d9f91ea3
 -51a95e52fc58d8be2c9c51576dff7258c705735b66d203948f80db017b4c10d2
++521d5186b8258794b21aa63f81883475846cb7d26b3a1ae3c7c47cbb9602b426

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/pragma.test
Simple merge