Merge latest trunk changes into this branch.

FossilOrigin-Name: 9685880f7baeb670739fdcf2d9df08e22abaa699

diff --cc manifest
index 8b4409d2ff284fd131120d39b453702aa67f1feb,d4a4aa1bdd38f3de3090fd8d5309c31989547f1b..98dcf120d990da12357741762c753d68d2994a09
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\ssome\sproblems\swith\smulti-column\sIN(SELECT...)\sprocessing.
- D 2016-07-27T19:33:04.107
 -C New\stest\scase\sto\sinsure\slegacy\sCREATE\sTABLE\ssyntax\sis\ssupported.
 -D 2016-07-28T12:52:30.552
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2016-07-28T13:59:21.728
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -337,7 -337,7 +337,7 @@@ F src/ctime.c 61949e83c4c36e37195a8398e
  F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
  F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
  F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
- F src/expr.c bee29fbb017db26ad1189d35b2a7fe6ff8da3722
 -F src/expr.c fbc17c717a80b5b61158ea8f25b5af6f8cad66f8
++F src/expr.c 82bc40bb27bc68b45303b560ab14eb16e39786a7
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
  F src/func.c 61a4114cf7004f10c542cfabbab9f2bcb9033045
@@@ -388,7 -388,7 +388,7 @@@ F src/shell.c 9351fc6de11e1d908648c0a92
  F src/sqlite.h.in c6e68a4a47610631822a4f8f83a44c9f75339331
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
- F src/sqliteInt.h 9a6af8787f03f54ce02ff88bd45f89bb600c3a4c
 -F src/sqliteInt.h d25c18c1272a7811e2569c39bfc2fca96156eead
++F src/sqliteInt.h 65cf752e1a62cedb2430ecc0547a09833ea13616
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -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 0b370db8ce08fac93a098f27eaf425d2269be376
 -F src/where.c 8ccc01f9227d41bfaf09360f108583be4a36d3b1
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
++F src/where.c df58d6ad7878a08aa96c652ccbc6d0949f8fa472
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
 +F src/wherecode.c 3aff7683566af3428f865904aafa7efb1fbd8701
 +F src/whereexpr.c b896f8ff6a53cbd3daaee84ec33e39098762bb46
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1510,7 -1508,7 +1511,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 d4f3d52c5a11fc7ad7e8cad76361edbcef13a12f 4d59df02d3713b3e3804e1a88e676749b2794286
- R 1d3755c62e27d021f9887ac09a170360
 -P 9e2b26811452a5011d0a97a689636fa4409da856
 -R d76a2fc86bbf1915af6bf1dd54a28237
 -U drh
 -Z 803b725d666d5af434be7409c67eabe6
++P 719a3b2035a335ca8b9704646b1d641011e3ea0e 6feff15cae8f0427be790355841d49c479c1c586
++R 3c287799720eaa100d938a8b5fd4645d
 +U dan
- Z 2549ddc5292b60c5848a8cde952880f9
++Z 3b75e2ba5b9150b77f0261ae152b7ba4

diff --cc manifest.uuid
index 21c7478815e960f98dba36be94c4523655ccdd3b,f4495ea5c1226ee842f8b37601fc7ff9f94b5501..88af2bcaa6ad7b237f447fe95e29e6e5079f4ad3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 719a3b2035a335ca8b9704646b1d641011e3ea0e
 -6feff15cae8f0427be790355841d49c479c1c586
++9685880f7baeb670739fdcf2d9df08e22abaa699

diff --cc src/expr.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge