Merge updates from trunk.

FossilOrigin-Name: ca5f2c545216c82486e66d26f55b49cbf351ffdc

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 2e3821137d79a6ac7aef811e2a53d11c3aeee51c,18464b0405877937ef73af686bd8ffb1dd02316e..8d577e9692cd119bbef732930d5cacac458cffb7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Get\sthings\scompiling\scleanly\swith\sMSVC\sand\sW4.
- D 2015-01-12T18:52:41.112
 -C Add\san\sassert()\sin\sorder\sto\scalm\sa\sscan-build\swarning.
 -D 2015-01-12T17:56:06.382
++C Merge\supdates\sfrom\strunk.
++D 2015-01-12T18:52:57.919
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 33a180534a9ba2cf80f5f87e8288c26423d0a8d1
 -F Makefile.in 876093578650b28af50a20c819993ee779885adb
++F Makefile.in 9efcdb5c6025caea362cdfc38817451170fc6344
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b363b90fe1bfc3b87d190f2f728a126c00d9ce09
 -F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
 +F Makefile.msc 2ed20e3ee252eb85dea357940a2e5e5649f9dd86
 +F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -179,9 -179,9 +179,9 @@@ F src/btreeInt.h a3d0ae1d511365e1a2b76a
  F src/build.c f5cfd7b32216f695b995bbc7c1a395f6d451d11f
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
- F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
- F src/date.c 53cedb541686b30eb5495753f0b622909a928780
+ F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
+ F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
 +F src/delete.c bd1a91ddd247ce13004075251e0b7fe2bf9925ef
  F src/expr.c 7be80f7dc337329a24df45c2f3bdb2ea3b64c90e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
@@@ -195,10 -195,10 +195,10 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c c82bc2650f64edfaf9c103342d0f8c58665213d4
 -F src/main.c 54c26e3f92153db87be276ca72605e7aa4c78029
++F src/main.c 05bf368c934cc73d02906030846eb4d1818c10f7
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
+ F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
@@@ -223,18 -222,18 +223,18 @@@ F src/parse.y c5d0d964f9ac023e8154cad51
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
 -F src/pragma.c bd33aa24456f043bb6f6d32a918bbeed41d8c591
 +F src/pragma.c ba149bbbc90783f84815636c509ced8eac11bbcf
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 9e75a6a0b55bf61cfff7d7e19d89834a1b938236
+ F src/printf.c ea82bcb1b83273b4c67177c233c1f78c81fc42f9
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
- F src/shell.c 0cebd04b204051652e969773af70feb42cf9bc2b
 -F src/shell.c 96ba1f6300d36b8c8694ee9e27edf92590f384b4
++F src/shell.c 5b8e786a7c8eec87fa3f2ea615b337d2d99e284c
  F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f25fe9df72dfee0eedfde4bacd0f02077d557631
 -F src/sqliteInt.h 8cdd843985cdc28bf5f291d89dc23a410a50f5ae
++F src/sqliteInt.h eaf210295b551d4e40e622aec1b2261c0b28f844
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -290,9 -289,9 +290,9 @@@ F src/tokenize.c e00458c9938072b0ea711c
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
+ F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c
 +F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
  F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
@@@ -1236,7 -1235,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 2b8eecbfe7935d3d9826fbcd473dd3a49138ad11
- R 23426bb53239eb240dd8df9d0d219aeb
 -P 46f3aba2692d74c29ab5c1f24a6daac600fd6af8
 -R 92ea1bf6542c9d9c7faa1f3f4f13619f
 -U drh
 -Z e7423f8002cbebe040ecb69ba833d201
++P c8725fa5fa361959b0f0a3fb36f204905d6f0ae9 11e81ac2a7c917f7c9afc218d104d9870daf9668
++R 2eb9ddda90091ff81afdfabf278ccd4b
 +U mistachkin
- Z 96c406dd077f9e953d8ddb5aba51e0dd
++Z b3ea8767e897ce2d6470ea9439664def

diff --cc manifest.uuid
index 9fb5a9bb7df6e173a77b0e71e0285cf271c57766,37e56a13ff0886aa8eac10cc0bc15e05f8467384..fd770dd259008ce2848c13059ada594ffbd81afa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c8725fa5fa361959b0f0a3fb36f204905d6f0ae9
 -11e81ac2a7c917f7c9afc218d104d9870daf9668
++ca5f2c545216c82486e66d26f55b49cbf351ffdc

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge