Merge fixes from trunk.

FossilOrigin-Name: 193f036c87857bd77577ceb462af5034c7cc77da

diff --cc manifest
index b6583d963c013f52fa69edb6736b38384c968421,0fd8b95f0cb350cce980a5f3c3c87636b86a6180..d9dec4830b82a2b9c88381b6c0258167a48d5341
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sobsolete\svector-IN\stest\scases.\s\sFix\sa\sbad\stestcase()\smacro.
- D 2016-09-06T19:08:21.705
 -C Fix\sthe\s".read"\scommand\sin\sthe\scommand-line\sshell\sso\sthat\sit\sunderstands\nthat\sthe\sinput\sis\snot\sinteractive.
 -D 2016-09-07T10:10:18.461
++C Merge\sfixes\sfrom\strunk.
++D 2016-09-07T13:12:13.158
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@@ -383,10 -382,10 +383,10 @@@ F src/pragma.h 64c78a648751b9f4f297276c
  F src/prepare.c 0fcf16eaacc90c1059055519a76b75b516a59a88
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 -F src/resolve.c d67b9a5cc33339256e2088c5a722745fc2ff5219
 +F src/resolve.c 24f40fd0c3475821d1ad762a3f2c3455cc839b42
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c fda7fd24b4d8e75479ae581329db0a0b0bf76633
 +F src/select.c 244f9cc5e4662987cd2ef5c22d1b7027560f3425
- F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
+ F src/shell.c de7c7e98846cacbfbe062cbd98bca899dfb720e3
  F src/sqlite.h.in 4a030e254e204570444b34bf7d40fb4a5416089e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@@ -465,10 -464,10 +465,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
  F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
- F src/where.c 48d705e5196a0611a7be90698eade455ee238536
 -F src/where.c 4bbc3f1dcda64c96ed5f0ffe51be7c0d7adb6c62
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c 98ce9f3b8d92b6f741b9f3498f9619695739256e
++F src/where.c edbd73a87ba2e186928e9bfc14348b1bbb2628c5
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
 +F src/wherecode.c b0d4febdd9de07ad68faadeacb30df9785f9b979
 +F src/whereexpr.c e3db778ed205e982f31960896db71c50612ae009
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1522,7 -1511,7 +1522,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 8329ac6f8d1edcc19c3e0559abe9a8011dbe1497
- R c63acfebc9bb94150dde03620f804079
 -P 820644b886f81e991fceb5f1c3290b8959b34528
 -R 2932afc8980d7b223aaea98945be0e61
++P ab3f8f193a7ec36018bf26c9231a1a6a58b6a523 d8451fe84d09db6ec7e1bd5f0708ea1b5e85f3d6
++R 9be49f79015d1d1f29328535fe4e7eb6
  U drh
- Z 4492b1886315f856574968e31e230cb0
 -Z 5c5e9ed55e639316842989db4edd69d1
++Z 2891e6cf4d042c296a4853701a08d60f

diff --cc manifest.uuid
index 130764cfa2e847d1e1b48f224fbcb125bf3cc773,342aced9e773ce54b96458543c9e3b3c323bbdff..c5b7f13bc8274d70d0bb9c1332422909c3646381
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ab3f8f193a7ec36018bf26c9231a1a6a58b6a523
 -d8451fe84d09db6ec7e1bd5f0708ea1b5e85f3d6
++193f036c87857bd77577ceb462af5034c7cc77da

diff --cc src/where.c
Simple merge