Merge updates from trunk.

FossilOrigin-Name: d9f4035b381dcf8d3c96c42017ce28ef66201933

diff --cc manifest
index 65c881694d9316801b2b0397ee42d9a8f710741c,cabfaf39169edc7b30c3b1dd5d3a0a7e5a39c69e..7e4412cd740817635ec47ae3f56df2edcc26afec
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Fix\scompilation\son\sCygwin\swhen\sSQLITE_MAX_WORKER_THREADS\sis\sgreater\sthan\szero.
 -D 2015-01-19T20:05:53.508
 +C Merge\supdates\sfrom\strunk.
- D 2015-01-19T07:42:14.456
++D 2015-01-19T20:19:22.634
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -230,7 -230,7 +230,7 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
- F src/shell.c e0fefd7e94a64df2fcb04e836a70d81b88c6a97a
 -F src/shell.c d2d3b46701e44369dd314bd6817541c60e2c39ea
++F src/shell.c 1a542717464cc8a4387d8d0e5bac4533ede7420c
  F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@@ -1236,7 -1236,7 +1236,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 f362c5d9d17a04404a0407a556202d101fde84ee 10321910990195878c0af1e94b34ae0cdc0cb31b
- R bd81873474d8855d431395cf94ae8755
 -P 824328f9833d01fc155a9d0265ef41d338cf1ffb
 -R 46d0fc0085c932a30f59bac1bd145cf7
++P c7167f88ec261eb0dbcea29817c7677e1f539d4a 2037442c582e51d85967bc911ea4a412eb4da573
++R f1484b10391f5c5603ce4fabac594ce3
  U mistachkin
- Z 939be034cfd3e7145f2a4a41c8a463bb
 -Z 998ddd7b1750b28ed4b199120a25244e
++Z a25ec5a48e2107a23cbe19afa260ac04

diff --cc manifest.uuid
index 1c18a5174b48e73a41f19f47c3e23a1c6e577a3a,5c080e945f1e112b005e9b1c216476b3331a674b..4e7cfa5d9b5d547a0f18cfc99327e10db8b234fe
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c7167f88ec261eb0dbcea29817c7677e1f539d4a
 -2037442c582e51d85967bc911ea4a412eb4da573
++d9f4035b381dcf8d3c96c42017ce28ef66201933

diff --cc src/shell.c
Simple merge