Merge trunk changes with this branch.

FossilOrigin-Name: 0e927a7e0250a65fd8e97b322cd69e93fadd13f0

diff --cc manifest
index bcec45f4587645025b3751ac6a2a27678373c2fa,9d5c14e49e15f41ba8ebb3267326504d342cfde7..3a589e97261226b92060144eafddd23e906a01a0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sa\sproblem\swith\sestimating\sthe\snumber\sof\srows\svisited\sby\sa\squery\sthat\suses\sa\smulti-column\sIN(SELECT...)\sconstraint.
- D 2016-08-03T18:00:49.612
- F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 -C Version\s3.14
 -D 2016-08-08T13:40:27.974
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2016-08-08T16:52:11.472
+ F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
+ F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -334,13 -334,13 +334,13 @@@ F src/build.c 7c3c780b703c09314032c8f6e
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
- F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
+ F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
  F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
  F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
- F src/expr.c 9539a6e0941248b63d631757406e089f48bea50c
 -F src/expr.c 9c5eca8602f6c496e8d4eefefe2aae3d831dd510
++F src/expr.c 94b3d94696e86840f2d0d038c638eefde57c2a40
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
- F src/func.c 61a4114cf7004f10c542cfabbab9f2bcb9033045
+ F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
  F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@@ -370,9 -370,9 +370,9 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
  F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
- F src/pager.h 031a87445e5e0afc85312d1c380e123ad6c7aeaf
+ 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
@@@ -381,14 -381,14 +381,14 @@@ F src/pragma.h 64c78a648751b9f4f297276c
  F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
+ F src/resolve.c 0392c6686586b1d4dac9a4106959f03ddd70e9aa
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 +F src/select.c 228eec644a778a31763b3d384d1ee1a5e3cf2349
  F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
- F src/sqlite.h.in e011dcc3942e6ddc8dd7b894e9e6702e4269161e
+ F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
 +F src/sqliteInt.h a1cf00afd6a5666a160e81c7a600418a3b59a8a6
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -455,18 -455,18 +455,18 @@@ F src/vdbeInt.h c59381049af5c7751a83456
  F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
  F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
  F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
 -F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
 +F src/vdbemem.c 77d6505956bf4e45c328ab3ebef6b461334cab5d
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 6fece06fdd50eb2b0673e37e627ce6710e4af5be
+ F src/vtab.c 6b3cfaff7e4397739d6b48511e777ca58c6d06d4
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 0a0b8af3920f88467d93019acdf570c4f4192f26
 -F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
++F src/where.c f60310d9fa2dd275698f3a768d2c63917353f22d
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
 +F src/wherecode.c c2392fa30bcb0c555a8ae402d646b357ca428ad6
 +F src/whereexpr.c 4a8cefc7c122132ac9f3ed125c61629a0e3de094
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1514,7 -1509,10 +1514,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 1559f4c43473e107f7196eea3ee91c53ede22999
- R f540153e91f079ff5413a490814ad157
 -P ebc396a19fa79bea208ecda277ffff5d02166d0b
 -R e7962d3372d6a1e29e3980753a6f0162
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.14.0 *
 -U drh
 -Z ecb9b7072c2b71d36f58909f83563ec2
++P 3c2f908f5b7312570cfa74afcf4252a857cb5237 d5e98057028abcf7217d0d2b2e29bbbcdf09d6de
++R e29053a139f99493b32e4ec805317c91
 +U dan
- Z 1ca41c3e8d4f391ec12438826156b785
++Z c05c70937976285652f33ed04f5e8c75

diff --cc manifest.uuid
index d13691699086c8939c9d27720bb935f2e3b148ef,732a4af61b711705ca45b57738a7d507c62476ec..d3debee4c26bed6b43159603c41571bcf0ec8e2d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3c2f908f5b7312570cfa74afcf4252a857cb5237
 -d5e98057028abcf7217d0d2b2e29bbbcdf09d6de
++0e927a7e0250a65fd8e97b322cd69e93fadd13f0

diff --cc src/expr.c
Simple merge

diff --cc src/where.c
Simple merge