Merge updates from trunk.

FossilOrigin-Name: ea99f4b29afb98dd474d96889c934763f5636891

diff --cc manifest
index d40b8f04c60755406d5a3f64c3452067c58b0b26,5142e98f04222b76c68ef01b291cb7fe58be3b4d..a6ec8d5c3ab74023f1841df89cf5e7069c09d131
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
 -C Add\sthe\sSQLITE_CONFIG_PMASZ\sstart-time\soption.
 -D 2015-01-02T15:55:29.645
 +C Merge\supdates\sfrom\strunk.
- D 2014-12-19T22:20:27.435
++D 2015-01-02T20:06:27.572
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
+ F Makefile.in 335e2d3ff0f2455eacbfa3075fc37495e3321410
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
+ F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
- F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
+ F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
@@@ -229,16 -229,16 +229,16 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 +F src/shell.c 1b7cb3efc5ae6fe82e36407508c4a6b00d8edde1
- F src/sqlite.h.in 116dc731361549ee3fc79dcebace11b57d24dcfd
+ F src/sqlite.h.in ed799ff5c814227c7957eb4f4a217f67fdc0da48
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h d36da9a07130cae13cbfee0986bf20028cb01465
+ F src/sqliteInt.h 3e0079855cb7b3c85dffac5bcbb1cd712ac62e65
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
- F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
+ F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
  F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
- F src/test1.c 56e33bf6b1827c6ca7520c189131ddd778fb2267
+ F src/test1.c 041c4edf2f9c49a329add297e26ee86a83852f51
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -1233,7 -1234,7 +1234,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 e0e102a0bd9d07bccdb1feb95767cb81fb57c29f da27a09d1d991583b59997f6cc67efa28ffd9d6a
- R 094886d67316bc30bdd2407fd2517021
 -P 2835e79a0afec6e4d449ac9340afec068c2d4c11
 -R 382d23526375da181cc875b46066d9ad
 -U drh
 -Z bc81c476960284f7c54d9feff6b6453a
++P 555fb71f6c479936446c2ce75b1b120a9a121f49 acb0d1e8324f19da3d4d577d58748848de1bcef7
++R 0ad9c82a4c41300c9e42937cd025154e
 +U mistachkin
- Z 63a739b2e08da80235a17753f68d1832
++Z 58d3b1fc40da37c01849f39453222e08

diff --cc manifest.uuid
index a06f967d2fd638fe3b1e5b58cd50b74b7d66661d,4fa42f8241ae75d41a8ec49dea3d8e84d4cf5e08..842f35c05dcbcc2c3c72aeba354284b3a9364f83
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 555fb71f6c479936446c2ce75b1b120a9a121f49
 -acb0d1e8324f19da3d4d577d58748848de1bcef7
++ea99f4b29afb98dd474d96889c934763f5636891