Merge bug fixes and enhancements from trunk.

FossilOrigin-Name: e2c4bdf54fc1b9605226c7d6c79ef4f8302d6213

diff --cc manifest
index 81128303117573cca467a1b6d48769d75f86689f,abe18f7860e3e0c7e24ff99d55dcd0973d83f010..3007287c22a48b9162ef3362b46b258a455d2680
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enclose\sthe\ssqlite3WalSnapshotRecover()\sroutine\swithin
- D 2016-11-22T21:11:59.294
 -C Add\sa\snew\srequirement\smark\sfor\sCAST\sexpressions.
 -D 2016-11-22T20:29:05.473
++C Merge\sbug\sfixes\sand\senhancements\sfrom\strunk.
++D 2016-11-22T22:23:56.288
  F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
@@@ -349,10 -349,10 +349,10 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 0d6e59f9eea62db772eabc0f07901ec26fe01968
+ F src/insert.c b07f929977f36d2279cc3bce41583e30881cb617
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
 -F src/main.c 694ac90557abdaa62151a6090670e107b0f2c2ab
 +F src/main.c 5669ae83c6bd47f090aee26a6b548a882d69e9e1
  F src/malloc.c 5ee7c2d3dcb1b0a902c9c6d0115deef54736bdfa
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -388,8 -388,8 +388,8 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 672b1af237ad257149fc5189f3277dcbca036eeb
- F src/shell.c f04e4af75c5517735397d060ed0b4a874104bb41
+ F src/shell.c b6ba45f741cc0e56ec7a3504855fe1373def2e16
 -F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027
 +F src/sqlite.h.in 631cc94108c1c03190d5f1edb70e7797c522a37a
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
  F src/sqliteInt.h c471d791b10c0f2164c8b7a87adc338e703c09cc
@@@ -465,13 -465,13 +465,13 @@@ F src/vdbesort.c 91fda3909326860382b0ca
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 7e8557314bcf867ffe3fff1d8ef2d207ace8e065
 -F src/wal.h bf03a23da3100ab25e5c0363450233cfee09cfc2
 +F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 +F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
  F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
- F src/where.c 952f76e7a03727480b274b66ca6641b1657cd591
+ F src/where.c 6bbf9284f4f15a6fa48663d033870cc0d7f5ee66
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
- F src/wherecode.c 507738d957dcc3cfa93020bcc1e4b02d11ecab9e
- F src/whereexpr.c a83d70154f3bbce5051a7e9710021f647c0fe4f2
+ F src/wherecode.c 4ea298998499db5a407ffd70e87e119a86ed7834
+ F src/whereexpr.c c19a84ac530835d37217db2181e4fe75901b7b97
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1535,7 -1534,7 +1535,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 28393c413cc4505b94411730e728583c5d4baaae
- R 87af84aaf5faeefdf69427a408fd9884
 -P f5ac98efb5d5f7751c5c560bed9c7885e60ac4bc
 -R 7f4eeea43dc88b31022d41b7c5421073
++P e7be3183eb25e0f9f04b9e251ff37fa5e50cc1a7 bee2859b953c935c413de2917588159d03c672d9
++R 7500b69c8f70e0aa644a793c47817ae7
  U drh
- Z eaed2a9cb4277f14d0de83d53d00fc85
 -Z a9cabf6ebd1d5980aefc6cb67510aa1c
++Z 287620fdf0a6d385015935bed448375e

diff --cc manifest.uuid
index f2d1cc2d078c143288dad7e7b14e04f0b3f05ba6,c87379ecc7b53e3420a1769d9c81a0b0201c47a7..3336f4478dbbcecc4f819d5e820defb74e25a1c8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e7be3183eb25e0f9f04b9e251ff37fa5e50cc1a7
 -bee2859b953c935c413de2917588159d03c672d9
++e2c4bdf54fc1b9605226c7d6c79ef4f8302d6213