Merge the latest trunk fixes into the sessions branch.

FossilOrigin-Name: 131a2d3116436ca6304777c9c5d46b7c4051d949

diff --cc manifest
index cd65a90b734442773af8642a28eddc3f9bd9ff1d,d67728f0c0459af6d478a79ca848ecb8a2610e24..646a50f52f553792288162ed53136023d65ffdea
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2015-02-21T15:13:50.198
 -C Add\ssupport\sfor\sthe\slinenoise\scommand-line\sediting\slibrary\sin\sshell.c.
 -D 2015-02-25T13:48:10.884
++C Merge\sthe\slatest\strunk\sfixes\sinto\sthe\ssessions\sbranch.
++D 2015-02-25T14:02:53.832
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e63f98067fef9d9112380e3aec9881f56d49f77e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc edbe2e2a9d27a4a56bd2891808a7c013bc322f6e
 +F Makefile.msc bed794fe507466c950f2b5c2d6d70b4e1e9bf14f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -248,11 -231,11 +248,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
- F src/shell.c 75e9d6dc85586c4a8e52f3be44c3a23dd3ef8d0d
- F src/sqlite.h.in e26cf36c3dc7099d6fcef864e362ee26261cc082
 -F src/shell.c f06cca68a3f07e03d35d2f879375967169db6a61
 -F src/sqlite.h.in 86cddbfdb3155967858c1469108813bcc08eda21
++F src/shell.c f21e2cec006b04d4d871209016286157279d70e0
++F src/sqlite.h.in 763e178cf0e47056a0abc572a42eacb5d1164196
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
 +F src/sqliteInt.h 1e1c08093c57dbd7c5d0b6d945f1c1d039f1128e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1257,7 -1239,8 +1257,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 ae7eef117f28a5dae7a05805f2d31ac532a9fcc5 c299e55a661c04f71ab43cb8aed04f8ece6e0567
- R b7f8fa563aa6e3bf4b2e063495f61f72
 -P 034c16bd24ddca363946a4b8751418469d890d2a f7f2598c376a27a86acc21578779c03d0016cd30
 -R 39a5a9d65bc63648e34cb80c3dc9dec4
 -T +closed f7f2598c376a27a86acc21578779c03d0016cd30
++P f36bb5fa5c5e3430808fe35d58f45559a216d341 03bbb947192b0c28d960604eae12e5fc2fa6e74e
++R fea8faac07d1963bbee76d04f5507233
  U drh
- Z 87039a26f4b6e7975795e319beedb047
 -Z c8318c1240f80cb8fe06db610b0ca5b1
++Z 94f89bcaf784abbabd110bdd6f219892

diff --cc manifest.uuid
index d66ebf70a72fbc380c9e7d368c0c7887743169bc,acb199a50a1c83513710469f4e4f2f8c1a7dd965..31db3b1068147fefb64c17b0d01c992ce972fc68
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f36bb5fa5c5e3430808fe35d58f45559a216d341
 -03bbb947192b0c28d960604eae12e5fc2fa6e74e
++131a2d3116436ca6304777c9c5d46b7c4051d949

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge