Update this branch to match latest trunk.

FossilOrigin-Name: d325da6c50f2f9c10f50b3839f87c155876c339879bb8bdb82567b5ff34ef7ba

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index a5708dcf3a17258a9813f77f56a7f693c610da62,eadda83d65f97542d49ec3b5d7239538697a9b27..57a59acd5c2c6787f17cc6d2fae3b4d991507d29
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2017-10-11T20:26:07.704
- F Makefile.in 19a5d26bdb3c58f02172fe56127dfc442bbcc7a9efcd8b644679d1151b60aae3
 -C The\ssrc/shell.c\sfile\sis\snow\sgenerated\sfrom\ssrc/shell.c.in,\sso\sremove\sshell.c\nfrom\sversion\scontrol\sand\supdate\sthe\smakefiles\sto\sbuild\sit\sautomatically.
 -D 2017-10-12T13:47:48.544
 -F Makefile.in 9c9f4dea3f622464cba9768501aceca187d2bbae10b60bf420b531cd776fe5c0
++C Update\sthis\sbranch\sto\smatch\slatest\strunk.
++D 2017-10-12T14:13:31.376
++F Makefile.in 51259a193f348a96b0ebc60ad84cfe83fdeecdd1d0ecb24f0e278a35ac1449da
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc da26eb328f72e7da5d422f0dece4c755c808286c8ecb338992bb6ec7a519b2b9
 -F Makefile.msc 3f96a87fb271b06aede7e304234cce096edd3d5ad76507ccc4716b20511a3b20
++F Makefile.msc e3fd2bfdf18211892e3f09db7e2841753fe61cc0747a0b0e87d77406840c3f6e
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -388,7 -382,7 +388,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 4cbee942ff9620fe9cac704a3bfcf14def442103ae9a12367362e8f43dcee99d
 -F main.mk 3e671408634fb8e8eaa296e80627066a2524053db5a9c5c28c6ec06cf7e99a51
++F main.mk 4ba2640f924e022ec66cadcb629e7e1d01aeb1932a004f92abc6238eac1c6a56
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -465,12 -459,11 +465,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 42aca61e739c405ddd8a1b702977a7743c7d52a94885f7c5596bd7e73e6bff18
- F src/shell.c cbf450e75665a185c546adc702ec5fd091306ae7a08bc88b1508ac9c11acc7fe
- F src/shell.c.in e03f7d473e10b65c25836a058a3e7a1665ffb1fe712949dcd6e38c790e4eafd0
+ F src/shell.c.in 423944f4ad73a7e73d9c06e645e19ac1aa5f45c22069936e3a008b28a5df8003
 -F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
 +F src/sqlite.h.in c442fca3fbabbc44b811218118fada3b63419a75974b50b82e9fd2fd5a49fda1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a1fd3aa82f967da436164e0728a7d6841651fd0c6e27b9044e0eb9f6c8462e47
 -F src/sqliteInt.h c07bc88eca1f59ce73e1f486187d0df4effe67c4579e112dfdd91c159e5c0569
 +F src/sqliteInt.h f7e05ec1473135a55e18627c842d438a5d4e3c43ddd440ddd10300fd48a16574
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -546,7 -539,7 +545,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 839db09792fead5052bb35e533fa485e134913d547d05b5f42e537b73e63f07a
  F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
  F src/walker.c 3ccfa8637f95355bff61144e01a615b8ef26f79c312880848da73f03367da1e6
- F src/where.c 80b3f578f1d7e92728f55ea6493b1d8266622e7d192bba836410931bf563e2e7
 -F src/where.c 049522adcf5426f1a8c3ed07be15e1ffa3266afd34e8e7bee64b63e2fbfad0b5
++F src/where.c dd3be478fc6089a1012d2ae5bb5d774f235e34bdb2ed391bc97e06b9367b9f1d
  F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
  F src/wherecode.c e8c2ece5843ea56e6c90277d421f2d628f3f7b7c976642369cc519f008e1d2b1
  F src/whereexpr.c afcac9cccfc0fdaccbdda94034a398947b6dc47dbf821c1b496261722832a6a4
@@@ -1662,7 -1656,7 +1662,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 58e42cfd7d4af2279dab8dd895dca7afbdf9035445bc81bd4a7461ea24e846fc 0245adffc6f9b580217e0d2feb396d6895e54cdc25f5dfc9c8f4090b919e9e49
- R d60da9c88de52ccb24e7a4680735e3d5
 -P 292921692c8919d29f0a67d03ca953d5c1c4900d8c8567cceab27513732be598
 -R 55fc95c237c6d381b00d7c404f68ae59
 -U drh
 -Z 4cb9f1b7e5b96c77468dac8db9ac0cf0
++P 2719cf5c5bbe8e31d18368d54d968af3878ad2e15f0666e18d7b567d7439c451 36acc0a97fdcc6f54f29c68c4e131702f69c3e59e58237ff4e5c647928699956
++R 7d4d36d7e390bddaee9373964ffc0b0e
 +U dan
- Z 9d8d7193d442e9ace0eb84ddd8802b2a
++Z 45c234430da48e38efb9390ff8797b6d

diff --cc manifest.uuid
index 2796a05d1cbebb4737f92c8751031166bd1f8e15,b48ef93c7908be9c4b7b3ee454504126f45d621b..6530f4e47ec126e60e2f9eb80334668703a390d9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2719cf5c5bbe8e31d18368d54d968af3878ad2e15f0666e18d7b567d7439c451
 -36acc0a97fdcc6f54f29c68c4e131702f69c3e59e58237ff4e5c647928699956
++d325da6c50f2f9c10f50b3839f87c155876c339879bb8bdb82567b5ff34ef7ba

diff --cc src/where.c
Simple merge