Merge updates from trunk.

FossilOrigin-Name: cc28106e5c196c0a9678fbbd06f6afd49271a8e8

diff --cc manifest
index a1507028778661823bac200d1cc667ddb6c5777e,e8e1304008e20371961fb11929cd0a65f1ef79e0..5048173d7cc45911b7e6d7b485df48c5166b8831
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges.
- D 2016-04-18T13:36:17.439
 -C Add\sthe\sSQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION\smethod\sfor\senabling\s\nsqlite3_load_extension()\swhile\sleaving\sthe\sload_extension()\sSQL\sfunction\ndisabled.
 -D 2016-04-21T02:27:56.575
++C Merge\supdates\sfrom\strunk.
++D 2016-04-21T15:03:37.535
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@@ -360,13 -360,13 +360,13 @@@ F src/os.h 8e976e59eb4ca1c0fca6d35ee803
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c d0b41a47eb5f0dc00e423a1723aadeab0e78c85f
- F src/os_win.c b169437dff859e308b3726594094a2f8ca922941
+ F src/os_win.c 1997a873bfc8296a701bd8e2df8c3d5da5afe956
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 4d849ad718980d698157cd136a40dc91cbeff4d3
 -F src/pager.c d20fa46d5beda38095be6070dd4c59e502817c72
++F src/pager.c bb8c7ff706aa88e7c2ec9a6175a128c01bc3ae5f
  F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 -F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 +F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
 +F src/pcache.h 60bc9893bfc0e16f8178fb5d8b6fcb8fab1d93c0
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
@@@ -385,9 -385,9 +385,9 @@@ F src/sqliteLimit.h c0373387c287c8d0932
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c 457c601302b8a0f5960dffd17b6a2877603841dd
+ F src/test1.c abc10e3e81258835aeb59616685d7369ba99ad1e
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
 -F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
 +F src/test3.c 0df6f8dbb4cbaa7106397c70a271fa6a43659042
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
@@@ -875,9 -875,9 +875,9 @@@ F test/like.test 81632c437a947bf1f7130b
  F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
  F test/like3.test 3608a2042b6f922f900fbfd5d3ce4e7eca57f7c4
  F test/limit.test 0c99a27a87b14c646a9d583c7c89fd06c352663e
- F test/loadext.test 648cb95f324d1775c54a55c12271b2d1156b633b
+ F test/loadext.test 42a3b8166dfcadcb0e0c8710dc520d97c31a8b98
  F test/loadext2.test 0408380b57adca04004247179837a18e866a74f7
 -F test/lock.test b984ab9034e7389be0d863fe4e64cbbc4d2028f5
 +F test/lock.test be4fe08118fb988fed741f429b7dd5d65e1c90db
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
@@@ -976,7 -976,7 +976,7 @@@ F test/pcache.test c8acbedd3b6fd0f9a7ca
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test cd1fa041074ed08eeaa563e4d1bacb0c69337ec1
- F test/pragma.test 36daccdbfbdd958a5f65c034141ab2bfd959808e
 -F test/pragma.test dd5313eee9c6d9d4726593a68ede8768d3b50ccc
++F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 3f1984a04657331f838df5c519b443c2088df922
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1484,7 -1482,8 +1484,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 85f3d80eb7319754792eef76996b2c740a2b0073 3a7d72986fabe9434ff5bd02c93169314f072b23
- R 10404030b7871fd2cdace5bd8bb71227
 -P 3340f086510b08ce5b42a8781f1df51bf7c27701 debafa5efd37ac60e030d0963ce8e7c4f51a0f10
 -R dbbe3c46925f0d8701c8262054bfff8c
 -T +closed debafa5efd37ac60e030d0963ce8e7c4f51a0f10
++P d9768de502e34da42f3ad955947c23da50f57bce c4f165c460c4244ed434107feac005efa3c386cf
++R 46a947ce1c80cd48530d3e6dff00dfca
  U drh
- Z 6da7b721a063bb7a65bebbe0704c9e5d
 -Z 9611378dd74ba12ce4b14951f611f1d2
++Z 049109eccf475c334bc4eb599a0e0693

diff --cc manifest.uuid
index 5a0c9f6cf321362c9513d7a4caf8e03ae5129617,cda7b3c0ff37cf495c366a019118ac176458dec9..8cdc841c3b23991e55f03f8d332ddda844fe8350
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d9768de502e34da42f3ad955947c23da50f57bce
 -c4f165c460c4244ed434107feac005efa3c386cf
++cc28106e5c196c0a9678fbbd06f6afd49271a8e8

diff --cc src/pager.c
Simple merge

diff --cc test/pragma.test
Simple merge