Merge latest trunk changes with this branch.

FossilOrigin-Name: 1a4182eedd0143c3f71b3d97f1d1bb25adeba617

diff --cc main.mk
Simple merge

diff --cc manifest
index 6014c72a7b6ee6ca286cac0ed65bacf79cfb5b2d,69b6e1ba9ff3d54c67f04829d44e5a36e924fe99..78c07a5223c95628589973352ac6353b88924a00
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2016-01-22T14:46:21.566
- F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 -C Make\ssure\severy\sco-routines\shas\sits\sown\sset\sof\stemporary\sregisters\sand\sdoes\nnot\sshare\stemporaries,\ssince\sa\sco-routine\smight\sexpect\sthe\scontent\sof\sa\ntemporary\sregister\sto\sbe\spreserved\sacross\san\sOP_Yield.\nProposed\sfix\sfor\sticket\s[d06a25c84454a].
 -D 2016-02-09T02:12:20.490
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2016-02-09T15:10:56.225
+ F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d2b93511a969c0c8fcf52aeb5e426571e8c610d2
+ F Makefile.msc b0493f10caddb8adf992a4e6f1943141fc7c6816
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -10,10 -10,11 +10,11 @@@ F art/sqlite370.eps aa97a671332b432a54e
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
- F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
+ F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
+ F autoconf/Makefile.msc a35b2aab24d1603f3f0ae65cf01686c2578d319c
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
- F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1
 -F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa
++F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa w autoconf/README
+ F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
  F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@@ -269,7 -272,7 +272,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk a94c4aea441c36e88fd14e009b99029d2e4f8e84
 -F main.mk 37497b06d3e3acb2c71675d76627a3b2639c6db0
++F main.mk cd48a5d8a6dc59229f4f3fe40771104f2918f789
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -424,10 -427,10 +427,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
  F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 4610f0b9b937af62df7196f39a3f469d06f01636
 -F src/where.c d89fd5cff448ab5c5ca492dd9793b35ffe31ab35
++F src/where.c 438b89caa0cbe17cd32703a8f93baca9789d0474
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
- F src/wherecode.c 8dee26eb181ea9daa8b1a4d96f34c0860aaf99bd
- F src/whereexpr.c 197a448b52073aee43eca3a2233fc113369eb2d4
+ F src/wherecode.c 791a784bbf8749d560fdb0b990b607bc4f44a38d
+ F src/whereexpr.c de117970b29471177a6901d60ad83a194671dc03
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -976,6 -980,7 +980,7 @@@ F test/savepoint4.test c8f8159ade6d2acd
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
  F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
 -F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
++F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test
  F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
@@@ -1338,9 -1342,10 +1343,10 @@@ F test/whereE.test b3a055eef928c992b0a3
  F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
  F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
  F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
- F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
+ F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
  F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
  F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
 -F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
++F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@@ -1421,7 -1427,7 +1429,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 44edc1aa3b412ddbe2a242075e2bf36a99437688 e4c07df557cd50786b05eecf011bf94708e6e31b
- R 52349324086f20f4365ca416f93ec5a6
 -P 6eab74c9ae57676044b5bc82fa14e92fd2448008
 -R 28a5285fd29b59b5a769fa2b98c8137d
 -U drh
 -Z 50a93197f1857fe46bad3c49957d1f43
++P 9341491c3a11d5a66e4f88d2af9b0d3799b4f27a ca72be8618e5d466d6f35819ca8bbd2b84269959
++R c3affb84a750d99cc1d1198e66d07e76
 +U dan
- Z f458e202045d703a80b0791cfb8fc733
++Z dbcdec085ed65802fe686b0a9369fd51

diff --cc manifest.uuid
index eb173bec2489ce8cea5504d0d8f090c5bf732805,9e7ed6ea0867335bed60efdec1b95d62d1fbbde9..b2c40d21e220ca1848dc1f3bb56117aad26ed21d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9341491c3a11d5a66e4f88d2af9b0d3799b4f27a
 -ca72be8618e5d466d6f35819ca8bbd2b84269959
++1a4182eedd0143c3f71b3d97f1d1bb25adeba617

diff --cc src/where.c
Simple merge