Merge all recent changes from trunk.

FossilOrigin-Name: 8ee7d346c1d9beedd02bf11d0a45810985a45480

diff --cc manifest
index 9c0d1f72b0cf95e8eca480c697fc1f319d02d889,5d26916c17466c97e39b6e1b4bb9459792a37754..5d23e19f5ee3b1fd48bb8670c4737b7b20ad80c9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2016-03-16T19:34:45.426
 -C Have\sfts5\scache\sthe\sstructure\sof\sits\sindex\sin\smain\smemory.\sUse\s"PRAGMA\sdata_version"\sto\sfigure\sout\swhen\sthis\scache\sshould\sbe\sinvalidated.
 -D 2016-03-21T15:30:50.247
++C Merge\sall\srecent\schanges\sfrom\strunk.
++D 2016-03-21T15:54:46.624
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -330,20 -332,20 +332,20 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c f89e3ca1c2e3d5015b847aec60371c474acbac82
- F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
+ F src/os.c ca10edb445ad2c5fdc7285b49d72bcdf261fa23e
+ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 4bde11921a2bebcf2167efc8540ddabc814189dc
- F src/os_win.c cbf8c442a0d818d05bcf40b093cb3ebad435b9be
+ F src/os_unix.c 50103f69121bca969761b821e2b0e393b55fe869
+ F src/os_win.c 551d973ada67127430e41d9e514e53f6beb6c5a7
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
 -F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
 +F src/pager.c 476884ce8d8e845daf88f1b12b8ca446bac5fdc5
 +F src/pager.h bb26afd6fa33f684832895ede771f6459e513e5a
 +F src/parse.y a74adac187a88fb949739aae203939241c06e62b
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
- F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c 04baa9343771f913f1c86b2720f768be8a3ad52a
+ F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
+ F src/pragma.c e7e8f380efec6075a722822306435afc1eeca88a
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
  F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
@@@ -352,10 -354,10 +354,10 @@@ F src/resolve.c b8f7174e5f8c33c44ded3a2
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 6dd2097bb158efe3b8d68683dcc3b4a49e907a34
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
- F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
+ F src/sqlite.h.in e877f141b15ef68ef28f84714e69d7234f9a071e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 636044ff0d0f6716d69a58eb0bf35c9748681d75
+ F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
 -F src/sqliteInt.h 4eb80a9b9a512180a9739f99d754915e03d8091a
++F src/sqliteInt.h a5e25cd7eb5c7066cd9319c9d8568ac4f5f54dc8
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -375,7 -377,7 +377,7 @@@ F src/test_backup.c 2e6e6a081870150f20c
  F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c cd88b616e98347bc6bbe84918ae3f4b8c1267590
 -F src/test_config.c 0fb2571777ef43a8442be4f9c62a25f530872328
++F src/test_config.c 794367cf23e2532dd9b425486c2c6a17ac133d31
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -414,15 -416,15 +416,15 @@@ F src/treeview.c e4b41a37530a191579d3c5
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 34ef7be420f82415ec48131404995ddb6ee7502f
+ F src/util.c cf7dce85ab9af5280b8a45985df2591efbfefe56
 -F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c f19741f2d8b33e8f09cd2219570b6c9ed924c3f1
 +F src/vacuum.c c1a94413f8fa9d9b2cbe3af9a89377f777be676c
- F src/vdbe.c 1ea96d12f6b6abe9fe431fdb038b67e95c569778
- F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
++F src/vdbe.c c96ca245b38be7a7798b512f3418a921b7db314e
+ F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
  F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
  F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
- F src/vdbeaux.c 1e45699bde381272cdf4d06f2061084dd934040a
 -F src/vdbeaux.c c8dd3e4e932bede6363b380519d05c0557ad27ce
++F src/vdbeaux.c 8bf5783ff0c39720252120bd258e169e14069c29
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
- F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
+ F src/vdbemem.c fe76c1f866de362d9b8332e59d74aa44f6560d69
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
@@@ -1307,8 -1306,8 +1309,8 @@@ F test/vtab_alter.test 9e374885248f69e2
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
  F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
- F test/wal2.test e3493f2245cb90139c5dbd6ca8c2946ec2049404
- F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
 -F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
++F test/wal2.test 7effe771f5c194edc3c38922f71c2f4c789d998e
+ F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
  F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
@@@ -1459,7 -1458,7 +1461,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 c393ddc71a041a711f8eaa6fbd75371309df5602 dbf84705913c0845ca4e75eb30c91536c754efeb
- R 3420699ed150f0495aa008889aa429d7
 -P 4bd12b57ea177cfb1f44d54bfa7aedfb8a8c0c64 89296a46c3b891ee0b637ff6f89d828d6e46e7b5
 -R 81b99f33bb0a77bc5e744352db10978f
 -U dan
 -Z db5fc495668353fb57116ffc2b5d2027
++P a7978ab6d26b865f55c6b3e86ba3a24777a3c1f0 902f221754f3cc6fb4ae049c135f85efce604ed3
++R 3d99d53779e8a1be1ff4c3c336814f62
 +U drh
- Z f7d70ad9abdb6c936c1532c0be39b5b1
++Z cad688af00172239d8afdc418e2a0374

diff --cc manifest.uuid
index c96f1acb646955fbb327625299741f6b5e85bcea,fb9fd2a351112cb2bef37c9f47268e90626bd1ef..787e3a0660aeca518b8d0184816d37e44a9b962b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a7978ab6d26b865f55c6b3e86ba3a24777a3c1f0
 -902f221754f3cc6fb4ae049c135f85efce604ed3
++8ee7d346c1d9beedd02bf11d0a45810985a45480

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/wal2.test
Simple merge