Merge updates from trunk.

FossilOrigin-Name: c7167f88ec261eb0dbcea29817c7677e1f539d4a

diff --cc manifest
index 0e6bdc83949e8d3a41459d6f5dfd308e1fc0e230,976365ad63a5219ad4ce2159e420d29e69cd74a7..65c881694d9316801b2b0397ee42d9a8f710741c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\sthe\snew\sshell\stest\scase\sto\swork\son\snon-Windows\splatforms\sas\swell.
- D 2015-01-18T09:02:57.181
 -C Eliminate\sall\suse\sof\ssprintf(),\sstrcpy()\sand\sstrcat()\sfrom\stest\slogic\sbecause\nOpenBSD\shates\sthose\sfunctions.
 -D 2015-01-19T00:35:53.426
++C Merge\supdates\sfrom\strunk.
++D 2015-01-19T07:42:14.456
  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 b976fd2b3dd3c097e7749f26b9cb8c6ca75985a8
 -F src/shell.c 4958f393be95eaf223dd51f7eb799f6c5e800060
++F src/shell.c e0fefd7e94a64df2fcb04e836a70d81b88c6a97a
  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 25e99f3fe5e4c90e92554b8ac6cd6a83a8d01a6a
- R 43870c62c1e65e8d20eddaf6282c1e54
 -P 7096e6c06d9a3e48d3f0d134f5f3275dde796be2
 -R 7d263eb98fc5c91928b9a60626248b0a
 -U drh
 -Z 962c42be5c17a76b63845109393eb3c7
++P f362c5d9d17a04404a0407a556202d101fde84ee 10321910990195878c0af1e94b34ae0cdc0cb31b
++R bd81873474d8855d431395cf94ae8755
 +U mistachkin
- Z 9565e92f8c2f373e24d28ccccb448894
++Z 939be034cfd3e7145f2a4a41c8a463bb

diff --cc manifest.uuid
index f08ce1ec5d3695ba33d6ddf913242f17f033374a,fbfc967ad3d23da03f7becf052ba0fab5d9b4966..1c18a5174b48e73a41f19f47c3e23a1c6e577a3a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f362c5d9d17a04404a0407a556202d101fde84ee
 -10321910990195878c0af1e94b34ae0cdc0cb31b
++c7167f88ec261eb0dbcea29817c7677e1f539d4a

diff --cc src/shell.c
Simple merge