Merge updates from trunk.

FossilOrigin-Name: 3e363f405655e2e39588029d797496a952cca11d

diff --cc manifest
index 3ea52b4721e59d1115014d8c98d37346ce13fa27,38d28bca9b96d72e035e17cec88a183c6eccbccc..6bc3e931c0a36de00974342b11d350f80e1eb5c4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C Fix\sa\sbug\sin\serror\shandling\sin\sthe\s".trace"\scommand\sof\sthe\scommand-line\sshell.
 -D 2015-03-19T13:30:41.360
 +C Merge\supdates\sfrom\strunk.
- D 2015-02-27T19:40:08.070
++D 2015-03-19T14:46:52.931
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
+ F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc edbe2e2a9d27a4a56bd2891808a7c013bc322f6e
+ F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION d846487aff892625eb8e75960234e7285f0462fe
+ F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -230,16 -230,16 +230,16 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
- F src/shell.c 7929bf046ae5ea2a245f8e4ba0f3bc85e76e65dd
- F src/sqlite.h.in 62d3997824038cc32335b04aaa18cc8f4c19e9be
+ F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
 -F src/shell.c 3e8fc22bc1cd63fe595c84a880bd6184deb6c87b
++F src/shell.c c8b054cf359d90d809d05929944fbe5ff138019a
+ F src/sqlite.h.in 2d48e05677d0f9b06b7757662eef3cebea02d837
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
- F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
+ F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1
+ F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c b290774586f022e16e04ba8ed2f0b8edd86b5b77
+ F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -858,10 -863,10 +863,10 @@@ F test/sharedA.test 0cdf1a76dfa00e6beee
  F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
  F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
 -F test/shell1.test ca88b14a8fc8b1f3543a24e519d019585ac9c903
 +F test/shell1.test 0860b92352f061ab075ea099af3ce8ac920b6f65
  F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
- F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
+ F test/shell4.test 4cd3bd50200bf2efd6a74175d98da65aa86daf26
  F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@@ -1239,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 913c41b2cdb7c1ec9eba2c8889715b18f693a2bf d70b0fd4c94f2b70cf31c2ab9ef7a2fb2e71c182
- R c18fa78cee792514fb2af38b954e20bc
 -P 49ea2cded4a76596f85419c820cdaf4a1751d7ac
 -R df8b9299e9511ef4e1117da2a3444343
 -U drh
 -Z 8cda5daec6a5d1c3721d0a7774b9a78e
++P acf7684323da4dc3aaf9746bd13b0f56054a17dd 6a48b5d794e891fdd167547c76835d677eb5e31d
++R 33a835e4a3288b5fed9ba7fe2398105a
 +U mistachkin
- Z fb458256c681287c05da541cf55853dd
++Z df3a91ba83fdf4e9cee85e83987e7d93

diff --cc manifest.uuid
index 4d4b00d84c6174e0e47fe9cafffdd7327891691e,52200038fddb7151f2e0addd9603c8c649822470..29447111e17b31e95fec2bea18f9f64c7a4cd129
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- acf7684323da4dc3aaf9746bd13b0f56054a17dd
 -6a48b5d794e891fdd167547c76835d677eb5e31d
++3e363f405655e2e39588029d797496a952cca11d

diff --cc src/shell.c
Simple merge