Merge enhancements and bug fixes from trunk.

FossilOrigin-Name: f52765ee7bddf047ce32d7448ee0c409e27d349a

diff --cc manifest
index 6245dda200d63635f6995544ba90e27f8cfac8ba,8fad26fa93976bb34c148508228edc4882ee9383..9422990b3b6845773d196af408f9e58716898f9a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Fix\sthe\snolock\sVFS\sso\sthat\sit\ssupports\sshared\smemory.
- D 2016-04-29T17:07:39.260
 -C Fix\sharmless\sLLVM\scompiler\swarnings\sin\sthe\ssrcck1.c\sutility\sprogram\sused\nduring\sthe\sbuild\sprocess.
 -D 2016-05-02T13:57:19.631
 -F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
++C Merge\senhancements\sand\sbug\sfixes\sfrom\strunk.
++D 2016-05-02T15:00:23.726
 +F Makefile.in c3d3154bf7fed85676ea6d758cc9c9048b52e750
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -364,11 -361,11 +364,11 @@@ F src/os.c bb97ef31f4674b0bb57d13a98183
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c dc9694fd389773f34ce36b3e16be18e7b3582ea5
 -F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 -F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
++F src/os_unix.c defa2c6c6e01219459fa783d2f55841271c4eebc
 +F src/os_win.c b717a28c34e158dbd392b57ead178903e17968ce
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c a8d30c49c231e9a20d05257613db922532588963
 -F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
 +F src/pager.c c02274c29feb73f909b6253cd89fa5f48dfe9627
 +F src/pager.h 7b85589162a781d75fb62c4750ba31ddce9500c5
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
  F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
  F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
@@@ -447,10 -443,10 +447,10 @@@ F src/update.c 3e67ab3c0814635f355fb1f8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c ccc79856f9c70c2627c7219e51959e4b3e38142d
 -F src/vdbe.c 4bad04212736526845fda9ca674afafb10078b2b
++F src/vdbe.c c375dd8c58d50beb34619b6e24dfda65e7fd2d09
  F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
  F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 -F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
 +F src/vdbeapi.c ded51c087af11b0d725720036ec12aea5140a6ee
  F src/vdbeaux.c ace1875da40b7185e604586768d5ac90de7e4f7f
  F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
  F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
@@@ -458,14 -454,14 +458,14 @@@ F src/vdbesort.c 0a8f98366ae794442e6d1e
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 4db22ed7e77bcf672b1a685d6ddeffba8d5be302
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 5c7bde7a5f29c6321a66804210fd3b73aeb74aad
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c bae50f2f18f9e8584549a77363858623b07e4915
- F src/whereInt.h 7de94b751f088fe3fdc8cc04a491376f0900a059
- F src/wherecode.c 8fdad9fbba723df1c1e8d07e7ea8507572040340
+ F src/where.c 019e5b10dedcf54ef077ce23dd8fce38d614dcf4
+ F src/whereInt.h 3b1fc240e322613ba4e9dc857ca9c7c3390acc74
+ F src/wherecode.c 28951741be3974701186281ced0564e9586a0db3
  F src/whereexpr.c eacc0e60d029a082b4fc0cc42ea98544add1319e
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -1120,7 -1115,7 +1120,7 @@@ F test/tempfault.test 0c0d349c9a99bf5f3
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptable2.test c3d8c138f493207612960bbd6a8c50e84975e2ee
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 406a05a51747b0d9780aaad05c6eb3a00f857184
 -F test/tester.tcl 3ace46dee55f07e28a1e3ab03258b929fefcee5b
++F test/tester.tcl a9f62aaa93c912483a5103ecaca109396fe5aa77
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1491,7 -1486,7 +1491,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 81b76901e63d670c0f2302f56f1aeafcc7ff9922
- R f0d12fbe4bb3184fb47d2dfaba836095
 -P 3f221f592a9a19009076e568566c59801cd3fc32
 -R 9e19502e796cc0b447ced5695bd13d5a
++P ce11f8e8a38b36fd78c104ba7b6900f77d7b586b e4af967533f290862dfba1d9ef44d4c9ddd8a01b
++R ea66785569ab542699ebf09c5ffedb81
  U drh
- Z 508511613f1701b953ca3dfef90a6686
 -Z 98cb934422c4b3de5638d36de23360d8
++Z 8c801c8d8833e45d48758273d9554e3c

diff --cc manifest.uuid
index 162f66355ac9499aedf1e25a35adbccf5c6c3e41,b95adc4417ce5e696b6b4dfc0dbc9011dae4f929..05634a80b37e66b1d5a529bfdfe3c894ef17459a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ce11f8e8a38b36fd78c104ba7b6900f77d7b586b
 -e4af967533f290862dfba1d9ef44d4c9ddd8a01b
++f52765ee7bddf047ce32d7448ee0c409e27d349a

diff --cc src/os_unix.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/tester.tcl
Simple merge