Merge the latest trunk changes.

FossilOrigin-Name: dd16439ea12b0384abcb0cab3768a5933dabb0cf77706c6ec9797209794b04ab

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index df33bc9c9e85f2531b9c897e50ec8013d9bba97f,17be6d0663148268e3c3e75e0014333f4037f81b..94d3c00be54f5316baa23016974ffa10791ad8fc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sall\schanges\sfrom\sthe\s3.18.0\srelease.
- D 2017-03-30T20:26:06.627
 -C Use\sreplace()\sinstead\sof\schar()\sto\squote\snewline\sand\sreturn\scharacters\sin\nstrings\sin\sthe\soutput\sof\s.dump,\sto\savoid\sexcess\sexpression\scomplexity.
 -D 2017-04-07T20:20:08.441
 -F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
++C Merge\sthe\slatest\strunk\schanges.
++D 2017-04-08T00:25:38.513
 +F Makefile.in 227347646e289e3b016ebb7a391ad6ed4ab56525834d56d47d1a83b8d97d6989
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc b66da6600003ed72fae3372fd4cd0148f9b4b5cf52cd3d272dbd8f17ca1c0354
 -F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
++F Makefile.msc fed3d46b77ac93f76f85ce6d285ea7640de205d165c77b95e331e02d834e1296
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
- F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
+ F VERSION 0a0e02e16b44ea735b40118fc844311b2ab0d35b25fbeda5120aee62f973f663
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -347,10 -344,10 +347,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 9f218dcf45716023de7e479774bc821b05efe5388a670ae2ee6f6716de5cecb9
 -F src/btree.c 24ae5472bd0b53b4130ecdda389deb621af721d1fcb50890b878102b00bd10fa
++F src/btree.c 1b654f06bcf5d8502f4a6f05e30e1bdc9f7c7d316ce58429db466865827351ab
  F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
- F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
- F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
+ F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
+ F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
@@@ -367,10 -364,10 +367,10 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5
 -F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
 +F src/legacy.c b143b1fe422524cb29cb5ac907c8a44684333d75
  F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
 -F src/main.c 158326243c5ddc8b98a1e983fa488650cf76d760
 +F src/main.c 0c3fecdde19dc698bb59d1901a8696a6be36ff64
- F src/malloc.c 89c98e3619d362dcffa5c1c639b364b65b474751
+ F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -396,21 -393,20 +396,21 @@@ F src/pager.h 32adb801774046224e87829fa
  F src/parse.y 48b03113704ee8bd78ee6996d81de7fbee22e105
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
- F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c ae2407b542a3dc14285dd41983e3f50de537eda23d3e7350963814766f7a931f
- F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
 -F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 -F src/pragma.c 220474f113cade6a6b5bacd3e3a65eca339acbee804128bc5db13a9cad55fba5
++F src/pcache1.c 4d201a7ee865e9a0ddc214db4c997e44215fefa15c1b0ec53cee40e9ba7a9716
++F src/pragma.c 28f232da1c31db79cbfe4818650c5fd293083a99af8f9f3eafcef254ce97613b
+ F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 2496d0cc6368dabe7ad2e4c7f5ed3ad9aa3b4d11cd90f33fa1d1ef72493f43aa
- F src/shell.c ceb2b2f1f958ea2c47a7f37972d0f715fbf9dcf6a34a5e98c886b85e3ce6a238
- F src/sqlite.h.in c30314cc52075796a78b3e14d1e032565c7e97b2a0fa2ffa068f38ed76ca6c0f
+ F src/select.c afcf31d8ed7c890328a31d3f350467ccd273af345b24562382b398d6d9cd0664
+ F src/shell.c 3680725485ce5022dc683d593e8a4b95f973597d843ddb8be788d7dc24d16de9
 -F src/sqlite.h.in ab77e511620eebbd4ed7e4f52fae697b6870dda66c945acd2d3066f99c98e17e
++F src/sqlite.h.in 7e99920e98319e8360cc260eef3da768799a18f4aecf6e0ef9a37a58fcc8f5b4
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 0c3e3daa672992437966213392f415b3d30273a92845536f8a0a94080a13880a
 -F src/sqliteInt.h 6cf244eb06119b44e155717708e54f0638c35e9bd8ef59ea570eb1f093f0da44
++F src/sqliteInt.h 46dc79e5afefa1fc26826e7aa01fe2d71c7e001f220743374af048e5e5588ba0
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -472,21 -468,21 +472,21 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
- F src/vdbe.c 316eae267851a274c05a4b31581afb88558101ebe40369ef525494f1d85abb14
 -F src/vdbe.c b070c9c81a5faff5d9fc9563c7c030e3e1adb69d835259470fd945ef61f3f9fb
++F src/vdbe.c ca1e58fc853ad55b508493144fdada650ae4756722f3c53415f7926ec995ec08
  F src/vdbe.h caa5346d52bae2a3c8c1dcfa60a7a4dc878a9e3865cb8239da55808b316c8158
  F src/vdbeInt.h 5db089ce18c4feff8820ec6e4cac2d2c82e03d4b1d96f10a6e43832147b8dffe
 -F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
 +F src/vdbeapi.c 995f635640bdbc38d95f24c467b87e79646b4ce4
- F src/vdbeaux.c ecd0468611925d218e1eb4b3f538907904b136f0e15e333291a232b521bfcef1
+ F src/vdbeaux.c 0ecacf8c7ca93e430b30819b8fc9b2c1ffe88202d1437e88c08a1f0b6159c58c
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
- F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
+ F src/vdbemem.c 8bb4dd22837da969bfda25ef3f92d41aaad192328f89a0951290d5e26ad7dbc4
+ F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 007513c2ef52472fcdea6a741683d50662e82790
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
 +F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
  F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c e815093e5ee039b6b4eb19b646d22deb1a3a523f
+ F src/where.c 49b48b720184fdde747c468d7270feeb1b88c6a71092cea3a1aa168dc8ac0b0f
  F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
  F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
  F src/whereexpr.c 130cdd1a43af71b19755270fb1224874cf55158c
@@@ -1033,10 -1028,11 +1033,11 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test af720e7d139e7e5417341d0f0eef2b911c0b067852138dc2f5b6a451b5725118
 -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
 +F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
 -F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
 +F test/pragma4.test 2fcabe7a352888f8aa70aad87eabe6481ea99b04
+ F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 9e6db85f81c63f2367c34a9d7db384088bd374ad
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
@@@ -1169,10 -1165,10 +1170,10 @@@ F test/subquery2.test 438f8a7da1457277b
  F test/subselect.test 0966aa8e720224dbd6a5e769a3ec2a723e332303
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 -F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 +F test/superlock.test c86eacd6cead5da9c5ecd25f3d46fca30a927ef2
  F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
  F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
- F test/sync2.test 29af00fe9e468a1e20315d1edced8f8a32ac156df983ae9b53802e7d472675d5
+ F test/sync2.test 6be8ed007fa063b147773c1982b5bdba97a32badc536bdc6077eff5cf8710ece
  F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
  F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04
  F test/tabfunc01.test 699251cb99651415218a891384510a685c7ab012
@@@ -1512,10 -1508,10 +1513,10 @@@ F tool/mkmsvcmin.tcl 95b37e202cbed873aa
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 2ffe6d5fdc2d3381621d6c77978ba054466e757f
+ F tool/mkpragmatab.tcl 32bb40741df11bddc8451de9ea4d130e7b4476d8064794b1cf402ac110840fba
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
 +F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
  F tool/mksqlite3h.tcl b9836752c3d08f9fab2dfc0017ca9fd5d90ac863
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1574,7 -1570,8 +1575,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 3d04b2cd7a68cf58ae739a5c6813562130e5c50c800c208c82769f76037f8f66 424a0d380332858ee55bdebc4af3789f74e70a2b3ba1cf29d84b9b4bcf3e2e37
- R 6d0f353b5301e13bfa3fc1119a23c0b2
 -P 48826b222c110a90996a84605318ea6b1e502b8c5129f4d561f8350dbdbcd264 4c2b572969ea2ed2a925444ecfa356aa877018cbb9c4f57d081ab4b535cd1dd0
 -R 33164644836f84aff2e4df2bff5189e1
 -T +closed 4c2b572969ea2ed2a925444ecfa356aa877018cbb9c4f57d081ab4b535cd1dd0
++P ed28f15e052b34f6642c68711fa3ed765c396262327fd3dd9c520b346a4deb81 7307352988174a6c2756dbbe200bf62a45fb4cc1da7faa2c6b0f75e229eab703
++R 637561b6d19adc336d692283417f7f26
  U drh
- Z 226af4d62e9a0804bc0108a41855537c
 -Z b74a0247eea28681dd3f2667b402dd90
++Z f8b51e3e11cef4f1805a54fb50d8968e

diff --cc manifest.uuid
index 0aec92847f40e51394a4e9da9facc94966dba8ca,35e56e96e3d7f1126ef627ddca4f32cee85e5ae5..cdd13d8440afa2fd29c2916b98f63fb531be9833
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ed28f15e052b34f6642c68711fa3ed765c396262327fd3dd9c520b346a4deb81
 -7307352988174a6c2756dbbe200bf62a45fb4cc1da7faa2c6b0f75e229eab703
++dd16439ea12b0384abcb0cab3768a5933dabb0cf77706c6ec9797209794b04ab

diff --cc src/btree.c
Simple merge

diff --cc src/pcache1.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge