Merge latest trunk changes into this branch.

FossilOrigin-Name: 9341491c3a11d5a66e4f88d2af9b0d3799b4f27a

diff --cc main.mk
Simple merge

diff --cc manifest
index 3f50c20486b1bd5c70451fc03e8ba5e37fdffa13,5d0ee23cca88fee2ee79cd394e19730b4f9a8104..6014c72a7b6ee6ca286cac0ed65bacf79cfb5b2d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\shandling\sof\stransitive\sconstraints\sin\sschemalint.tcl.
- D 2016-01-22T14:44:02.574
- F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 -C Enable\sFTS4\swhen\sbuilding\sthe\sshell\swith\sthe\sMSVC\smakefile.
 -D 2016-01-22T04:22:36.961
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2016-01-22T14:46:21.566
+ F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc e928e68168df69b353300ac87c10105206653a03
+ F Makefile.msc d2b93511a969c0c8fcf52aeb5e426571e8c610d2
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
+ F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -263,7 -269,7 +269,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 0aec7410e847a886ed8260b829e4e72f060b0431
 -F main.mk 960071a0bceb043bc5627573986154f507931f33
++F main.mk a94c4aea441c36e88fd14e009b99029d2e4f8e84
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -397,29 -405,29 +405,29 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
  F src/tokenize.c 5606871a377f390af7040ec3c12e0d183512d785
  F src/treeview.c 78842e90c1f71269e7a73a1d4221b6fe360bab66
- F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 40e51cd0883cb5bfd6abb7d8a7cd8aa47fab2945
- F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
+ F src/trigger.c 056e51182a3677434423e3be0c74e61b90b4a663
+ F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
+ F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c b56b2fc9b2f2d0a99d1dbd02d47efaacec253a4c
- F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
- F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
- F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c b660c995256e3d3e2cb47ccd20b82a1c342fa093
- F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
- F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
- F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
+ F src/vdbe.c b90d9d38e5e0260c2eafa3cb4c2274d8ea94da27
+ F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
+ F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
+ F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
+ F src/vdbeaux.c 07f8f485a6cbc0a62da660f14e303061d45d5cb6
+ F src/vdbeblob.c 37c3d11a753e403698c69e17383d282e1ae73e75
+ F src/vdbemem.c b9181e77eca2a095929d46250daf85c8d2621fc0
+ F src/vdbesort.c 0971557e5d3c289e46f56a52aed2197c13251de7
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
- F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
- F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
- F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 1e987b91aaafe2bb363488e43fcdac137f5b8b59
- F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 4c96182e7b25e4be54008dee2da5b9c2f8480b9b
- F src/whereexpr.c bd4877cd4dd11f6ab551ef0054535ca3c6224950
+ F src/vtab.c 320682cca733115b4cbe71320b5c5eeb1074ebde
+ F src/vxworks.h 974e7d9a98f602d6310d563e1dc4e08f9fc48e47
+ F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
+ F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
+ F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
 -F src/where.c af9bf5dcec1a0e52726c550924aa91d837166251
++F src/where.c 4610f0b9b937af62df7196f39a3f469d06f01636
+ F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
+ F src/wherecode.c 8dee26eb181ea9daa8b1a4d96f34c0860aaf99bd
+ F src/whereexpr.c 197a448b52073aee43eca3a2233fc113369eb2d4
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1381,8 -1395,7 +1396,8 @@@ F tool/replace.tcl 7727c60a04299b65a92f
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
  F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
  F tool/run-speed-test.sh 0ae485af4fe9f826e2b494be8c81f8ca9e222a4a
- F tool/showdb.c d4476e000a64eca9f5e2c2f68741e747b9778e8d
 +F tool/schemalint.tcl 49690356702d6cac07e2bb1790eac73862e92926
+ F tool/showdb.c 82dca79a999b2701c62417636345e9974151fdad
  F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818
  F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
  F tool/showstat4.c bda40d6e395df7edb6e9ea630784d3d762c35b4b
@@@ -1406,7 -1419,7 +1421,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 d4e37767671dc946b8a21d0158fc3044e36f0c7e
- R cbe06eb4db20d1a79810102395b5ccc1
 -P 67625b963a6f5a0c6dff1a04a323e693569c2d94
 -R a9194694e295a05f59bbd77f1c470bc0
 -U mistachkin
 -Z bf1c280948a8257fdbbacb5c97da93b0
++P 44edc1aa3b412ddbe2a242075e2bf36a99437688 e4c07df557cd50786b05eecf011bf94708e6e31b
++R 52349324086f20f4365ca416f93ec5a6
 +U dan
- Z e0e53a7502c2ab11481d0d1a7c5964ef
++Z f458e202045d703a80b0791cfb8fc733

diff --cc manifest.uuid
index 8879269b0abd293623b2ec5c651ed137cfdd8ec9,533751ec8ab1e30ea50142a731575363f7aa63eb..eb173bec2489ce8cea5504d0d8f090c5bf732805
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 44edc1aa3b412ddbe2a242075e2bf36a99437688
 -e4c07df557cd50786b05eecf011bf94708e6e31b
++9341491c3a11d5a66e4f88d2af9b0d3799b4f27a

diff --cc src/where.c
Simple merge