Merge recent changes from trunk.

FossilOrigin-Name: 959677b97ba15f786936c762e2e68df1151d7ed0

diff --cc manifest
index 96a97863721c810af284111f5ab917030f9cd111,7c618d61d75a4cb4d00234fb76cfc2715722559d..37624e38f204099f10314d1cfbeb921283c98177
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\ssome\sproblems\swith\shandling\s"no\ssuch\scollation\ssequence"\serrors.
- D 2016-08-11T12:01:52.255
 -C Fix\sa\s1\sbyte\sbuffer\soverwrite\sin\sthe\s"sqldiff\s--rbu"\scommand.
 -D 2016-08-11T09:55:55.485
++C Merge\srecent\schanges\sfrom\strunk.
++D 2016-08-11T12:31:21.178
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -372,10 -373,10 +373,10 @@@ F src/os_win.c 520f23475f1de530c435d30b
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 40928c450320da78bb4bd3ae82818f4239e19b7e
  F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
 -F src/parse.y 99b676e6fc2f4e331ab93e76b3987cffdbd28efa
 +F src/parse.y a7402dff6fe8238795f15ca194e1f1b734d169f4
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
- F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
+ F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
  F src/pragma.c c8b499756658cb8b82cfdbb5845c22cf11f297aa
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
  F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
@@@ -462,11 -463,11 +463,11 @@@ F src/vtab.c 6b3cfaff7e4397739d6b48511e
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
- F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
+ F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
 -F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c 98ce9f3b8d92b6f741b9f3498f9619695739256e
 +F src/where.c 5bee250c8233c43bd7f53897d12b8468004f63db
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
 +F src/wherecode.c 92202261a6e41f897a595417c5b0c75c8acf713d
- F src/whereexpr.c 4a8cefc7c122132ac9f3ed125c61629a0e3de094
++F src/whereexpr.c 8d9903d16ae45d15736745f7b75df2340c729782
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1515,7 -1510,7 +1516,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 ea03e219ced87777f0c3c6bbb0274078dbb829e2
- R 3327e29017db82c17326a5b9067bf8a5
 -P 2ea0c8b46eefd4874f021f8dfd344be751f2034f
 -R 26e854b22e510a9651c111418b0d5f03
--U dan
- Z 2191ed49fb7f045b414ebf34ab584005
 -Z 78ea492cf13c3fac64589b27f22aa44b
++P 8278be06fa69e3266866220bdaf5be45a5fcfa23 ab83d7077da80ddbcf399d0797d79e964dc64f0e
++R 8a0bc19d70d02f930372e2439d9171fd
++U drh
++Z 019cf0a70c3da3c6f133d37b0001aac6

diff --cc manifest.uuid
index b4dbc8b83322df874c17b90dd1a0457014ea50b7,22f2d26d976c9180d0109581e92596fe1a7bf80c..8c6670f9ffd6869026bc7c5422ff214e1bec5958
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8278be06fa69e3266866220bdaf5be45a5fcfa23
 -ab83d7077da80ddbcf399d0797d79e964dc64f0e
++959677b97ba15f786936c762e2e68df1151d7ed0

diff --cc src/whereexpr.c
Simple merge