Merge updates from trunk.

FossilOrigin-Name: 5b5d3e4d0d158594c0db05ddbf4d926b65825042

diff --cc manifest
index ca272bdab73879a2d0175aba6b587720f26541bc,528f1250c54ee99b1e3f853f6a3f059276b4f3c1..82f498501ba8342b304dbbfafb886425cc17f761
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C Fix\sa\stypo\scausing\sa\stest\serror\sin\se_walhook.test.
 -D 2014-12-10T20:57:20.700
 +C Merge\supdates\sfrom\strunk.
- D 2014-09-01T01:15:22.673
++D 2014-12-11T02:28:42.201
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
+ F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
+ F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
+ F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -185,55 -190,55 +190,55 @@@ F src/global.c 6ded36dda9466fc1c9a3c549
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c d1a104e67b33314d4cc5c1356147446086ab9fc8
+ F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c 87c92f4a08e2f70220e3b22a9c3b2482d36a134a
- F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
- F src/loadext.c 31c2122b7dd05a179049bbf163fd4839f181cbab
- F src/main.c 900dd06e41d22795cbb23ab0240397f1e2901bf7
- F src/malloc.c 954de5f998c23237e04474a3f2159bf483bba65a
+ F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
+ F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
+ F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
+ F src/main.c 4bfb07de96118350a63103380819ff8cbbefc5cd
+ F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
- F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
+ F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
+ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
- F src/mem5.c 74670012946c4adc8a6ad84d03acc80959c3e529
- F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
- F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
- F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
+ F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
+ F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
+ F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
+ F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
- F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
+ F src/mutex_unix.c 551e2f25f0fa0ee8fd7a43f50fc3d8be00e95dde
  F src/mutex_w32.c 06bfff9a3a83b53389a51a967643db3967032e1e
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
- F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
+ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
+ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
- F src/os_win.c d067fce558a5032e6e6afe62899e5397bf63cf3e
+ F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
+ F src/os_win.c ecb04a0dad2fa6fa659931a9d8f0f3aca33f908a
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 3e732d2bbdd8d8d95fed0c5ae7e718d73153c4c5
- F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
- F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
- F src/pcache.c 3b3791297e8977002e56b4a9b8916f2039abad9b
- F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c
- F src/pragma.c d10ef67c4de79f78188b965b4b7988aff1d66f2e
- F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d
- F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74
- F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
- F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 1c4667571f2c9e339b5a5c5b152a9ea7b0bc4163
- F src/shell.c 31c5f73b524e86d675786e45c4bb2a2260ed65d8
- F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
+ F src/pager.c 7a5c5bc0e29b9b16834f5558a9d5d22bbae59a08
+ F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
+ F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
+ F src/pcache.c ace1b67632deeaa84859b4c16c27711dfb7db3d4
+ F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
+ F src/pcache1.c facbdd3ecc09c8f750089d941305694301328e98
+ F src/pragma.c d54cdd40b63d608f2d95b7482c710690e3593a73
+ F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
+ F src/printf.c 9e75a6a0b55bf61cfff7d7e19d89834a1b938236
+ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
+ F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
+ F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
+ F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
++F src/shell.c 1c7787d1066d1a858b8a4812663fde0e4a85b755
+ F src/sqlite.h.in 2e699aabd1df6042aff4265cd93bdc8812629f11
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h d8a9be2aa123a78c90ad4aba09b23e7dd3f8cc9f
+ F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
+ F src/sqliteInt.h 28049b803b74a7f73242a8226915ea00ebb1309f
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
- F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 7d100e2e7aad614bb3d7026a41a0e3827dbaaebc
- F src/test1.c 14409a611e9c27c6c522c610bbff5561f05c1558
+ F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
+ F src/tclsqlite.c c6a21c64da1490e14d53cdc2062d1e2e57942622
+ F src/test1.c 7e806af12d7915445e46407d32b275d8ca9db4e7
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -820,13 -848,14 +848,14 @@@ F test/shared7.test a81e99f83e6c51b02ac
  F test/shared8.test 00a07bf5e1337ecf72e94542bdefdc330d7a2538
  F test/shared9.test 5f2a8f79b4d6c7d107a01ffa1ed05ae7e6333e21
  F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
- F test/shared_err.test 0079c05c97d88cfa03989b7c20a8b266983087aa
+ F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
+ F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test 1c0b7a79b1b91a56253ee0c4fbb309d39d16641e
- F test/shell2.test c57da3a381c099b02c813ba156298d5c2f5c93a3
 -F test/shell1.test ab6025d941f9c84c5b83412c6b4d8b57f78dfa3a
++F test/shell1.test 0d2cece602988da3fa066c00adf19cda0b1306ad
+ F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
  F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
 -F test/shell5.test 15a419cc1df21c892ed64f5596ae7a501f2816f2
 +F test/shell5.test 7dbc03751ceda1e5ce75553dff735a7ef0dea15c
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
  F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
@@@ -1188,7 -1227,7 +1227,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 9c424a5c50e4a2ed36556e99fba0e7072a2d3468 f61db04be4d7fb21b7f721647c37c45e283ffbea
- R 61b36872188d211211b1fdf63b047fab
 -P 2eb6d3e4fbe388ef28e4b7b846e9e8a4361517a4
 -R 6969ca3627ab2efde502167b1f0ba7a8
 -U dan
 -Z dbe3e99b743e5bbd88e69201e8af7d3a
++P 51f33cf1290cf767c1c6ba0228f4f30e4059c994 d9f916ba09f1a61684b4d59548ab6cf71cdb6a37
++R 15ef4ed782851554150951631e8659fc
 +U mistachkin
- Z fd2f22c6bf37426e61dcc4cb1f623893
++Z e24780e51cf083f098b96480beceaf1e

diff --cc manifest.uuid
index 7b6f164ccde0a7f25156904a4378771a89721c4a,b7905779296e214bf7ec9fecd1532037c8651007..3eb6df633f061630a29a249347fa6e181edb2944
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 51f33cf1290cf767c1c6ba0228f4f30e4059c994
 -d9f916ba09f1a61684b4d59548ab6cf71cdb6a37
++5b5d3e4d0d158594c0db05ddbf4d926b65825042

diff --cc src/shell.c
index 25d2f673e57020e0b0c910f3e1527bd4da1f6025,94d20d354929f2ba0776dcd030dcfed0687acaf2..22e691a8cbe68e83e7b5a70ee8c01b2958177d0e
--- 1/src/shell.c
--- 2/src/shell.c
+++ b/src/shell.c
@@@ -898,9 -890,9 +911,9 @@@ static int shell_callback
          for(i=0; i<nArg; i++){
            output_csv(p, azCol[i] ? azCol[i] : "", i<nArg-1);
          }
 -        fprintf(p->out,"%s",p->newline);
 +        fprintf(p->out, "%s", p->newline);
        }
-       if( azArg>0 ){
+       if( nArg>0 ){
          for(i=0; i<nArg; i++){
            output_csv(p, azArg[i], i<nArg-1);
          }
@@@ -1678,8 -1715,8 +1755,9 @@@ static char zHelp[] 
    ".quit                  Exit this program\n"
    ".read FILENAME         Execute SQL in FILENAME\n"
    ".restore ?DB? FILE     Restore content of DB (default \"main\") from FILE\n"
 +  ".rowseparator STRING   Change row separator for output mode and .import\n"
    ".save FILE             Write in-memory database into FILE\n"
+   ".scanstats on|off      Turn sqlite3_stmt_scanstatus() metrics on or off\n"
    ".schema ?TABLE?        Show the CREATE statements\n"
    "                         If TABLE specified, only show tables matching\n"
    "                         LIKE pattern TABLE.\n"

diff --cc test/shell1.test
Simple merge