Merge updates from trunk.

FossilOrigin-Name: c458db41bbb6bd13d47531685e25a09f512c7f5f

diff --cc manifest
index e335fe6483609ab8665f861d63d3c65ad44e7af5,aa53c4300707e4239fa7bfe81f3cb95bb9136169..1d2d4915ddc8b3712cd94c9ec9889abb224053b5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Correct\stypo\sin\snew\stest\snumbering.
- D 2015-04-07T21:17:53.161
 -C Avoid\ssigned\sinteger\soverflow\swhen\sconverting\soversized\sin-line\sinteger\nwidths\sand\sprecisions\sin\sprintf().
 -D 2015-04-07T15:39:29.937
++C Merge\supdates\sfrom\strunk.
++D 2015-04-07T21:18:18.000
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
+ F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
+ F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -226,18 -226,18 +226,18 @@@ F src/pcache1.c 69d137620a305f814398bd2
  F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
+ F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
+ F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
- F src/shell.c 7c436bcafe1b71c4f27204db922fc9ff45c1c645
- F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
+ F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
 -F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
++F src/shell.c 6d509d555b7115886e5d55b69ef2b8944ae56114
+ F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
+ F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
  F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
@@@ -863,10 -865,10 +865,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 ce5e744870387164703bf2dee2cc9753e4a71513
  F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
- F test/shell4.test 4cd3bd50200bf2efd6a74175d98da65aa86daf26
+ F test/shell4.test ddf0a99044e2245a87fc17423e3aaa1445b3243b
  F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@@ -1246,7 -1249,7 +1249,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 6e504cd00b148b5acca73f039a20b8acc85dc2f0
- R 1543524725d791d58111400fab5dcb85
 -P 95625ef3adc3c408d67e70f877f390445fbb8292
 -R 5875861747bb686954783d9ce4259b86
 -U drh
 -Z e5281cee406ead55e17262e5bdbb2163
++P d176c9fa4c65ff2f3952dd3dee46da149dfa442f 8e4ac2ce24415926247961b00a62425ae85d6ffb
++R c57274a6c5462ea7b326b2f6ceaa1f1c
 +U mistachkin
- Z 8c1a6c6dddcfd14d8dad2e92c405b1ee
++Z 40ec821f482de26e176671e7dd444d41

diff --cc manifest.uuid
index 47c6805681a2431426bb10dbcad682b33faead8f,786af92027c2ea2d35d51155700d3ace8d4c5884..2e31d0fc1ec527d0fb4b090b7f59876a0343bf61
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d176c9fa4c65ff2f3952dd3dee46da149dfa442f
 -8e4ac2ce24415926247961b00a62425ae85d6ffb
++c458db41bbb6bd13d47531685e25a09f512c7f5f

diff --cc src/shell.c
Simple merge