From: dan <dan@noemail.net>
Date: Tue, 26 Jul 2016 18:15:35 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Tag: version-3.15.0~110^2~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9ed09d47b37b7dafa98e0456614fbac5cd94e47;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: d4f3d52c5a11fc7ad7e8cad76361edbcef13a12f
---

d9ed09d47b37b7dafa98e0456614fbac5cd94e47
diff --cc manifest
index c0f2b89a0d,7f897eb954..fd048d6c5d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\swhere.c\shandling\sof\s"IN\s(SELECT\s...)"\sexpressions\swhen\sthe\sSELECT\sreturns\smore\sthan\sone\sresult\scolumn.\sAlso\serror\shandling\sfor\sother\srow\svalue\sconstructor\scases.
- D 2016-07-26T18:06:08.100
 -C Ensure\sthat\sthe\ssqlite3_scrub_backup()\sextension\screates\sa\sbackup\sdatabase\sat\sleast\sas\slarge\sas\sindicated\sby\sthe\sdatabase\sheader,\seven\sif\sthe\slast\spage\sof\sthe\sinput\sdatabase\sis\sa\sfree-list\sleaf.
 -D 2016-07-26T10:46:21.988
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2016-07-26T18:15:35.133
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -372,7 -372,7 +372,7 @@@ F src/os_win.c 520f23475f1de530c435d30b
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
  F src/pager.h 031a87445e5e0afc85312d1c380e123ad6c7aeaf
- F src/parse.y fa040d742fe4922b219143fe2e04f74061daabcb
 -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 5c4d301a855d0245ddcc27365ddcbddd2f244665
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 +F src/select.c 0115f5d222f5cf9b5511ec4072088417354d738a
- F src/shell.c a8a9e392a6a2777fabf5feb536931cb190f235e5
- F src/sqlite.h.in b9ba728c1083b7a8ab5f6a628b25cd2a00325fbf
+ F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
+ F src/sqlite.h.in c6e68a4a47610631822a4f8f83a44c9f75339331
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 2a170163d121095c6ab1ef05ed0413722f391d01
- F src/sqliteInt.h c4877fb0519c13558d18d08775bc8e79476cb56c
+ F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
 -F src/sqliteInt.h 49081ceab08eda9943d555aee57392c5b35d1c60
++F src/sqliteInt.h a78e53083262e9a10fd1f09a8777755253c00b44
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -448,12 -448,12 +448,12 @@@ F src/trigger.c e14840ee0c3e549e758ec9b
  F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
- F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 680c118a20b4b496644001e7ff4819c3e3ff8d85
+ F src/vacuum.c 9dd2f5d276bc6094d8f1d85ecd41b30c1a002a43
 -F src/vdbe.c ea260b61e73b11a71e70b28a8e25866e2899e5da
++F src/vdbe.c 44d75e3585d93bf56c72de5e2ec4c5a16cd40370
  F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
  F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
- F src/vdbeapi.c 02bcbc2ca5d2004b029088b05b468b394881e103
- F src/vdbeaux.c c90275b0e55a2b32c03dc09314194fe46f2429d8
+ F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
+ F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
  F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
  F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
@@@ -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 48eed8ebe319c6cbc7bf7682018f32af0f5189f5
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
 +F src/where.c e7054b2c1fe31fef5136e5735d7958f5c2c7707d
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
- F src/wherecode.c 03fbaa63909d7e4b8af986595b811ae591032240
++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
@@@ -1131,7 -1128,7 +1131,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl e1379282de5810a047c75d84eb6c914e00743b7e
 -F test/tester.tcl 949b4a73bd0324b7c796818d0d6a6715712932b3
++F test/tester.tcl 542e38e307a6c1c362122d186f580ec3e58a288c
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1509,7 -1507,7 +1510,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 e2fd6f49b1b145bec09c581cc982b89429643ae9
- R a369e1eed01f702cd78474a2d1d557f1
 -P c0e7d98ef2a13ede5ae865083ede1aaffdf43310
 -R 783c6677056c1c6297ef166e24fadbce
++P 061b8006034f06a0311b4304c8b14d2c8b0153df 483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
++R 675e1e72a3d3f117d790dda9dd43e7d1
  U dan
- Z 9143269c80fa998d2598183a7a999846
 -Z 42a389186c57610d077ea553714cade1
++Z b0c1b915de5ec6a4159f97e64d5655ae
diff --cc manifest.uuid
index 5c153725ad,1e810448d2..e9f6e44c64
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 061b8006034f06a0311b4304c8b14d2c8b0153df
 -483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
++d4f3d52c5a11fc7ad7e8cad76361edbcef13a12f
diff --cc src/wherecode.c
index 69dd2e97fb,d78982f5b5..892831d821
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@@ -1409,13 -1317,9 +1409,14 @@@ Bitmask sqlite3WhereCodeOneLoopStart
            zStartAff[nEq] = SQLITE_AFF_BLOB;
          }
        }  
 -      nConstraint++;
 +      nConstraint += nBtm;
        testcase( pRangeStart->wtFlags & TERM_VIRTUAL );
 +      if( (pRight->flags & EP_Vector)==0 ){
 +        disableTerm(pLevel, pRangeStart);
 +      }else{
 +        startEq = 1;
 +      }
+       bSeekPastNull = 0;
      }else if( bSeekPastNull ){
        sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
        nConstraint++;