Merge fixes from trunk.

FossilOrigin-Name: 20372906cb236fde1cad0779217db408682a1f787d43ec7d2d3a5cc7d9f91ea3

diff --cc manifest
index 11284d647458028a4e18bc83f3d8a2cd0c99e0e4,ef865049dddaa2d4d4216e8f5034eaf67f551da1..a88b872cb711e14339a557b788b5ac1e82b77c00
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2019-04-02T00:34:14.699
 -C Make\ssure\sthe\sMEM_FromBind\sbit\sinthe\sMem.flags\sfield\sis\snot\sincluded\sin\nthe\sMEM_TypeMask.\s\sThis\scritical\schanges\swas\somitted\sfrom\sthe\sprevious\stwo\ncheck-ins\sby\smistake,\sand\sso\sthose\scheck-ins\sare\snot\sfully\sfunctional.
 -D 2019-04-02T00:56:20.542
++C Merge\sfixes\sfrom\strunk.
++D 2019-04-02T01:00:48.980
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -522,11 -519,10 +522,11 @@@ F src/resolve.c 567888ee3faec14dae06519
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
  F src/shell.c.in c1986496062f9dba4ed5b70db06b5e0f32e1954cdcfab0b30372c6c186796810
 -F src/sqlite.h.in e8a8dd45ae6849b3e40b243eca41181a740b4f4ac67d5b65fcea519d454db785
 +F src/sqlite.h.in c7149aaff3233282962b5faa4cc5c935c41684737a575c0a267320538626db2d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
 -F src/sqliteInt.h 59b625f88bf96cad4cd1a6a6ded615c161f518fb56da3e49f2ff70429e49095f
+ F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
 +F src/sqliteInt.h 21566eeb79fcba9afc061b47ad94bc0a949c84d79bbc03a0689587c6c523395a
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -593,10 -589,10 +593,10 @@@ F src/upsert.c 0dd81b40206841814d46942a
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
  F src/vacuum.c 532553ee1d47f69c1198858107b1f3af3d16af25f2ab4ce3b1263d9e333f26e2
 -F src/vdbe.c 711ef421b3bb3db3b2476067b2dc3c71ef5844d9b1a723026578f89f6da621e8
 +F src/vdbe.c 694e81e248dd69f19e2395b79c642b3fd3b9bf662c2431852bfe5a675885a7ab
  F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
- F src/vdbeInt.h 5ea6f6548a14b20a9210ca055a989478a37d16f84740cc123834f13e4527bce7
+ 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
@@@ -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 dc3c0b8b2815c0658bc4ca7c045102d627229dedf098801a554c06eb6dbe97b2 b3f2c3205a28dc21ea7080e5e1ba246ce9c9b90c1309262ca11d8e40943ed677
- R 0fe1f60b77a64d2d429ddd11edd3a802
 -P 6f122faf8a34b986e58ba4622cff918c6d133d6f91d4b723b50bd086d5bed8e1
 -R c3133c578f7e494c50d02207c9632dd8
++P 0b35aebbb316fb2849c3a6bb93ffa6300187d1dccbb162bdd00fde53eb61356e f7ba2daf91c96ba16958188d6084a0ff129310d348932de493d326f1d24679cd
++R 206b3d502105fb9da2ddab0c1a6f3b8b
  U drh
- Z 989239eb29f42d74afa2927ee8bc7515
 -Z c6ab367b45144d07fee8de57758b279c
++Z 06b4aa78d804874754643cf0bd9e299d

diff --cc manifest.uuid
index 38210d7cf5a19ae237da3e8680df1f9fbe8efec6,17d058fe0b7069472f7bcd715454aaa8576652c4..c89ef472305e0f5f9c432adfdc22a1896f2928ab
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0b35aebbb316fb2849c3a6bb93ffa6300187d1dccbb162bdd00fde53eb61356e
 -f7ba2daf91c96ba16958188d6084a0ff129310d348932de493d326f1d24679cd
++20372906cb236fde1cad0779217db408682a1f787d43ec7d2d3a5cc7d9f91ea3