Merge updates from trunk.

FossilOrigin-Name: 441a00e70d8c0a3d09b7f283a65a2918791ad1bb

diff --cc manifest
index 6bc3e931c0a36de00974342b11d350f80e1eb5c4,e2d910ce7068875a8c3b99928b3b519bff81abba..f90cdfce16bdf6a255d86e3b35b583a292704510
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Remove\ssuperfluous\sdefine\sfrom\sthe\sMSVC\smakefile.
 -D 2015-03-21T02:25:29.401
 +C Merge\supdates\sfrom\strunk.
- D 2015-03-19T14:46:52.931
++D 2015-03-21T02:34:17.432
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -231,11 -231,11 +231,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
- F src/shell.c c8b054cf359d90d809d05929944fbe5ff138019a
- F src/sqlite.h.in 2d48e05677d0f9b06b7757662eef3cebea02d837
 -F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
++F src/shell.c b13fcdf5b9c24c9abb487db6edcc3d138ec5a187
+ F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1
+ F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1246,7 -1246,7 +1246,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 acf7684323da4dc3aaf9746bd13b0f56054a17dd 6a48b5d794e891fdd167547c76835d677eb5e31d
- R 33a835e4a3288b5fed9ba7fe2398105a
 -P 737630b87314283b2c38790ace9d25ec05f81f4a
 -R bbf7713d7bc160a26b464271593d133d
++P 3e363f405655e2e39588029d797496a952cca11d 880d2513a0fb084fae82080401b108fb13e61478
++R 2726ca1fd09fea272fc1c80ed9f1f02e
  U mistachkin
- Z df3a91ba83fdf4e9cee85e83987e7d93
 -Z d79979d0d3fded9d4339ee09acdaf62b
++Z b45a25175857ca7588106b2ccc3489d8

diff --cc manifest.uuid
index 29447111e17b31e95fec2bea18f9f64c7a4cd129,81fc012beb5e7ec91ddc2947b3fa33f3c1ea4d69..4a0e0615b017cfcafbf78120f62eb727204845f1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3e363f405655e2e39588029d797496a952cca11d
 -880d2513a0fb084fae82080401b108fb13e61478
++441a00e70d8c0a3d09b7f283a65a2918791ad1bb

diff --cc src/shell.c
Simple merge