Merge latest trunk changes into this branch.

FossilOrigin-Name: d468101b421e073e9debd7381bde1d36af31369e

diff --cc manifest
index 12d2b31833c8dcbc11b60c89c607a0a599b2ddfe,dcecb8eb96c6a93d05ad8a75485740449c13e7df..b50f6287da6aa6064c29815ab418e56cf96fe821
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\smissing\scomments\sand\smake\ssome\scode\son\sthis\sbranch\sclearer.
- D 2016-08-02T16:18:35.278
 -C Updates\sto\srequirements\smarks.\s\sNo\schanges\sto\scode.
 -D 2016-08-02T13:26:34.987
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2016-08-02T16:24:10.101
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@@ -383,17 -383,17 +383,17 @@@ F src/printf.c a5f0ca08ddede803c241266a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 +F src/select.c 952aa1b4148ed4c0024586e9049b8742a765c6f9
- F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
- F src/sqlite.h.in cd10e4206b91c4bf03f121ab9209a14af0b48f14
+ F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
+ F src/sqlite.h.in e011dcc3942e6ddc8dd7b894e9e6702e4269161e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h f4206565eb5f5cef9a1544d32a076b5f47af1bdc
+ F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
 +F src/sqliteInt.h ccfffd24330a373a971fee69b6b06a9b7e9ddced
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
- F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
+ F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454
- F src/test1.c 906a04b649c7139e943193a3905d583e325c30c7
+ F src/test1.c 0a0909cf7962d2359db329c08d15b90b4b6e724f
  F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
  F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -463,10 -463,10 +463,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c a1c2fde60e806f1e045fdf745bfa449e3be82f55
 -F src/where.c bb1444f6ae6bc3cbd086cc61cd9c6e3a6168d89b
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
++F src/where.c 9dcbc1be0e8e84b1d323dae55983bbb902a6c484
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
 +F src/wherecode.c c01c8af9311b5d6d65de311101f72d94a11ae506
 +F src/whereexpr.c 4a8cefc7c122132ac9f3ed125c61629a0e3de094
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1512,7 -1509,7 +1513,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 3ef75d45ebcd8ede91596d69e55fe7d685008a60
- R ede02eaf849a0a0aa8962160f6f4e818
 -P e64a4173d2899acf13b73e6e28f2e164fd638a75
 -R 2f7c4e993e0eb7bb61a5a37266251c67
 -U drh
 -Z 9edc5e5cd5ca93c7d8faa216313b72e1
++P 6937677cc2c2db6b21f997559f88a339466cd15b b23c10ac8f65bc88a6c7d88e140217222eb4cbe5
++R bdbd7298ee0fa9cbc2f39cf393323b85
 +U dan
- Z d2db5fc489c89774ca610a9face0568f
++Z eb5884061bde99d3b56b31ee8ac9fde1

diff --cc manifest.uuid
index 026bb0a0e8303baf2826d4a1a157820012a5cd87,ac57330bc6ac199ca74d601bad52ae4ee63e75be..5800b91b48860ac7522fff64cb198e71ea6208e4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6937677cc2c2db6b21f997559f88a339466cd15b
 -b23c10ac8f65bc88a6c7d88e140217222eb4cbe5
++d468101b421e073e9debd7381bde1d36af31369e

diff --cc src/where.c
Simple merge