Merge recent trunk enhancements and fixes.

FossilOrigin-Name: c39cb0e2571f58c87053de009e2c135d71b2c3af

diff --cc Makefile.in
index bc312706c761fec7255c6948d7ff68624f745fbe,8952866dc6296c0fe92fa2b22dfeb08fe23fbd72..e3d323bbdf5b6b5feb16879a3db35394ed937afd
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -182,12 -180,12 +182,13 @@@ LIBOBJS0 = alter.lo analyze.lo attach.l
           mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
           notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
           pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
 -         random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
 +         random.lo resolve.lo rowset.lo rtree.lo \
 +         sqlite3session.lo select.lo status.lo \
-          table.lo threads.lo tokenize.lo trigger.lo \
+          table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
           update.lo util.lo vacuum.lo \
           vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
-          vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
+          vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
+          utf.lo vtab.lo
  
  # Object files for the amalgamation.
  #

diff --cc Makefile.msc
index 8907eee575dbc1a42d1e8df1518053310a6bd7c8,70c16b11c38dc71c72c5f02d45553c499958e558..33c2886c54fb89b5c01ec3012cea3d1ff0b26522
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -844,12 -834,12 +844,13 @@@ LIBOBJS0 = vdbe.lo parse.lo alter.lo an
           mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
           notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
           pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
 -         random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
 +         random.lo resolve.lo rowset.lo rtree.lo \
 +         sqlite3session.lo select.lo status.lo \
-          table.lo threads.lo tokenize.lo trigger.lo \
+          table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
           update.lo util.lo vacuum.lo \
           vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
-          vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
+          vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
+          utf.lo vtab.lo
  
  # Object files for the amalgamation.
  #

diff --cc main.mk
index db11a96d5949a398b62705449d8961a67f6b8370,3131386f3a07eedca5698026fbd3c485077d8ffb..79847924d06107e732dba76e13e7d8b32288d230
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -67,13 -66,12 +67,14 @@@ LIBOBJ+= vdbe.o parse.o 
           notify.o opcodes.o os.o os_unix.o os_win.o \
           pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
           random.o resolve.o rowset.o rtree.o select.o sqlite3ota.o status.o \
-          table.o threads.o tokenize.o trigger.o \
+          table.o threads.o tokenize.o treeview.o trigger.o \
           update.o userauth.o util.o vacuum.o \
           vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
-        vdbetrace.o wal.o walker.o where.o utf.o vtab.o
+        vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
+          utf.o vtab.o
  
 +LIBOBJ += sqlite3session.o
 +
  
  
  # All of the source code files.

diff --cc manifest
index c7877d9297f769fc38445a6aeef4e93992321522,53cae3d4c508fc2866d387a6c74cce469210dcfa..7b3a3280690274def03aa21a4176c5f2800f73c1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Add\sthe\ssqlite3changegroup_xxx()\sAPIs\sto\sthe\ssessions\smodule.\sFor\scombining\smultiple\schangesets\sor\spatchsets.
- D 2015-06-11T17:26:10.939
 -C Remove\sstray\soutputs\sfrom\sthe\stest\ssuite.
 -D 2015-06-11T14:19:05.376
++C Merge\srecent\strunk\senhancements\sand\sfixes.
++D 2015-06-11T18:01:29.396
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 58c16cc8cd876ed112902e70cf33d33f3270b5aa
 -F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
++F Makefile.in 5f56f6186fdbd0fb33226e9d2279acde3b3fa88b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f4c7677780d417c7574b61904ad9195124675b26
 -F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
++F Makefile.msc 3165ac5ae2fee79cf7d5e025b879f7a52ae66776
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
- F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9
+ F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
@@@ -190,7 -171,7 +190,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 3ba6bc8133b4b2f020a9c6043aa1fe7e35d16cb2
 -F main.mk 68f86c21505d6b66765a13c193f00a53dde6a212
++F main.mk 2395b88d31e71bbd6f9dd26bd6db26948ead9eb3
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -220,8 -201,8 +220,8 @@@ F src/complete.c a5cf5b4b56390cfb7b8636
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c 5075d88557eb4e2a7fdb2b61a96142830d8589b8
- F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
 -F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
++F src/delete.c b998fbc3c55e8331a5f40aa7ff80972254de8de1
+ F src/expr.c 710c764c1974b15a0e56b004ff9f5e6ceab3a854
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
  F src/func.c 5b8b8e77a0fb644eaf8947d413804622e32692b6
@@@ -229,7 -210,7 +229,7 @@@ F src/global.c 4f77cadbc5427d00139ba43d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 6d9cde1aafe23b157fcc4a6567bf1fb1a1cb8ce3
 -F src/insert.c b5f8b35a1b7924020e48cade5b2b5017bca7906b
++F src/insert.c a81d4454051c92d058d79cd77099e700e36a74f6
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@@ -269,12 -250,12 +269,12 @@@ F src/printf.c db11b5960105ee661dcac690
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 5978cc521cb8fc1aa6a0089e35edaf531accb52a
+ F src/select.c 45a814a755f90c1a6345164d2da4a8ef293da53d
 -F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 -F src/sqlite.h.in d165beeceb6b40af60f352a4d4e37e02d9af7df0
 +F src/shell.c f26cca96f7dadab5efb5e655edf548f4b91695c5
- F src/sqlite.h.in 9d68f87febe52dbba2f3fb30d68aeba38ab957e2
++F src/sqlite.h.in f61a45445596dc9fe4cdc84a2c042fb310653bef
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 2ebeb634e751a61a6f0eebfa0f4669f46a42f6cd
- F src/sqliteInt.h 7f3d18ce72c0a3c81961941f9f288975bd134378
 -F src/sqliteInt.h 8f095bfe43ba68c32bac8d5349131ffacc660967
++F src/sqliteInt.h eb4d0375eb9fdfcc95c58f7b4c3f6f738ba42850
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -326,18 -307,19 +326,19 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c baa0e550dfa76a8d781732a7bfb1f0aa094942f2
+ F src/treeview.c 84aa2d2ed26627ccc8dd3a2becfa18dc86ee4607
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
 +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c e4b07daec26aaeb3700308f82770485f0a28a988
 -F src/vdbe.c 0a6a1df5c31415a0e974e74e7bd412616889453d
 -F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
 -F src/vdbeInt.h f0ccddac48583d5f762dc554a9f79e85ea8807e0
 -F src/vdbeapi.c 6a0d7757987018ff6b1b81bc5293219cd26bb299
 -F src/vdbeaux.c 46f9bc4b32866082eb87a36b461e487a0bbdbe8e
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c 67b302dc6df64b4d6785881c5d22bd4f9b17739d
++F src/vdbe.c c4fc60e18ec234d88f47f59f89f294f2af2436ea
 +F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50
 +F src/vdbeInt.h 50e298245b66b320c8930219c8aeab492c9a4cce
 +F src/vdbeapi.c a5d2e8afd53b4f81934f5ca59c04465cd1a6d50d
 +F src/vdbeaux.c 9b50d9248b54a9961fdd4d5a9ec5c05f93045a7b
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
- F src/vdbemem.c c704f0f2515a658d8d1566a5f2f3dc9870622427
++F src/vdbemem.c 794bba184f95cc64c7e089f01ca9789624c14a61
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
@@@ -839,7 -825,7 +844,7 @@@ F test/pagesize.test 5769fc62d8c890a83a
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 47e3d26e7412ae56b990c93e25ee2c49caa7f28e
 -F test/permutations.test 6b0f339a4d5f00041555a986dde8fbe8f54c25bc
++F test/permutations.test 242d5aa14f84cb03ae830342b176d2b15ec55ffb
  F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@@ -965,7 -950,7 +970,7 @@@ F test/tclsqlite.test 7179b4e0bf236ddf0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 60a09b25c1c1b96ccd3a697bbf80e7c2402c94db
 -F test/tester.tcl b3a41e20f98a029a76e930b33d0711c5854267bb
++F test/tester.tcl d3f3d3e46f0bc852a395fa1d6469b75582708ff7
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1266,8 -1251,8 +1271,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 40c287d3f929ece67da6e9e7c49885789960accf
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
- F tool/mksqlite3c.tcl 508aac36881e12c4f6e5eb72d9920d1fbc1a1216
 -F tool/mksqlite3c.tcl d79e450048b0bbf04d53677e01c249a012981182
 -F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
++F tool/mksqlite3c.tcl 12444ca6af8600db9fa08cbd134705f2f758387e
 +F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1301,7 -1286,8 +1306,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P fb3914070791c84b5f323b7359ac845246d8a844
- R 8257ada0208a724be61180fd75fdecb0
- U dan
- Z fef5e9795fb303b4eab93bd557fcafaf
 -P e63d01c69c3e50f49ee3022a519c4f3e91f00520 e64a5681793238fa04fe3636f48d34b2dd36cdfa
 -R 169aa55aecdac74f95270959f0b49156
 -T +closed e64a5681793238fa04fe3636f48d34b2dd36cdfa
++P 0c1a901cd60e557fc676b97625243163dfe9be9d afc6db9b105f32110112b877f06091757888a5f2
++R badb2019580fc793add1b23514b50992
+ U drh
 -Z 8e453d8625c4e71ab15cead2df245827
++Z f08b8b4c812a9cba111c95cd9b9fc9e3

diff --cc manifest.uuid
index c7a49060eb88727654bf17b05592af430ccf9e27,9c8de4cbd1af750636508333bb0b3506d7b11422..ea039b1940cfb97105e9e1a494e3101b411bb565
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0c1a901cd60e557fc676b97625243163dfe9be9d
 -afc6db9b105f32110112b877f06091757888a5f2
++c39cb0e2571f58c87053de009e2c135d71b2c3af

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbemem.c
Simple merge

diff --cc test/permutations.test
index a76811fe8eb3b35206e1679e4b6a504775990e71,01779ff50ff547f715eb0adb41442f4b6a6f3d8e..cba5f24c87d9d57b6821bb1d4386e222a00a1f39
--- 1/test/permutations.test
--- 2/test/permutations.test
+++ b/test/permutations.test
@@@ -99,7 -96,7 +99,8 @@@ if {$::tcl_platform(platform)!="unix"} 
  set alltests [test_set $alltests -exclude {
    all.test        async.test         quick.test  veryquick.test
    memleak.test    permutations.test  soak.test   fts3.test
-   mallocAll.test  rtree.test         full.test   session.test
+   mallocAll.test  rtree.test         full.test   extraquick.test
++  session.test
  }]
  
  set allquicktests [test_set $alltests -exclude {

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge