From: mistachkin <mistachkin@noemail.net>
Date: Fri, 27 Feb 2015 19:40:08 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.10~11^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0404e74caa95a4cde7bdba71ad95d6eb8f924c01;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: acf7684323da4dc3aaf9746bd13b0f56054a17dd
---

0404e74caa95a4cde7bdba71ad95d6eb8f924c01
diff --cc manifest
index 5bf240eb06,b4667b6c06..3ea52b4721
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Improve\sprecision\sof\sthe\snew\stest\scase\sby\sremoving\sa\ssuperfluous\scarriage-return\sfrom\sthe\sshell\scommand\sinput.
- D 2015-01-19T21:27:46.816
 -C Add\sa\scouple\sof\srequirements\smarks.
 -D 2015-02-27T00:33:15.390
++C Merge\supdates\sfrom\strunk.
++D 2015-02-27T19:40:08.070
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
+ F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 4c057774e6138b9023fc16ec05639ddd3329b152
+ F Makefile.msc edbe2e2a9d27a4a56bd2891808a7c013bc322f6e
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -223,18 -223,19 +223,19 @@@ F src/parse.y 0f8e7d60f0ab3cb53d270adef
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
- F src/pragma.c ba149bbbc90783f84815636c509ced8eac11bbcf
+ F src/pragma.c ea0be138a99784b14e87bd4522fea40e7b979e9c
+ F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c ea82bcb1b83273b4c67177c233c1f78c81fc42f9
+ F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
+ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
- F src/shell.c f5e99e5411313da3f17d63be3393f567dcfd8f66
- F src/sqlite.h.in 9dfc99d6533d36d6a549c4f3f01cacc8be956ada
+ F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
 -F src/shell.c f06cca68a3f07e03d35d2f879375967169db6a61
++F src/shell.c 7929bf046ae5ea2a245f8e4ba0f3bc85e76e65dd
+ F src/sqlite.h.in 62d3997824038cc32335b04aaa18cc8f4c19e9be
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h eaf210295b551d4e40e622aec1b2261c0b28f844
+ F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -855,7 -858,7 +858,7 @@@ 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 a80eda2760914c0795bc825b2882bffe6584cc29
 -F test/shell1.test ca88b14a8fc8b1f3543a24e519d019585ac9c903
++F test/shell1.test 0860b92352f061ab075ea099af3ce8ac920b6f65
  F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
  F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
@@@ -1236,7 -1239,7 +1239,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 4ec2aeadf949028956e20b72999e2e9cad451922
- R a4cb3f9354b52dabfb63b39cf4621164
 -P 3bc34fd427d9d7819cd9740237b1f5d4180341fa
 -R ea56360259f5f37b0ed4591b0dd003bd
 -U drh
 -Z c0882f7c7d1c49cd54726f112c10b39e
++P 913c41b2cdb7c1ec9eba2c8889715b18f693a2bf d70b0fd4c94f2b70cf31c2ab9ef7a2fb2e71c182
++R c18fa78cee792514fb2af38b954e20bc
 +U mistachkin
- Z a6be402bd05c2e2cd199f4183006fc6a
++Z fb458256c681287c05da541cf55853dd
diff --cc manifest.uuid
index 9ccfff886c,1881ff1d28..4d4b00d84c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 913c41b2cdb7c1ec9eba2c8889715b18f693a2bf
 -d70b0fd4c94f2b70cf31c2ab9ef7a2fb2e71c182
++acf7684323da4dc3aaf9746bd13b0f56054a17dd
diff --cc src/shell.c
index b7fa627bfb,4aaa2d90ec..3099c1eda1
--- a/src/shell.c
+++ b/src/shell.c
@@@ -1731,9 -1751,9 +1751,10 @@@ static int run_schema_dump_query
  static char zHelp[] =
    ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
    ".bail on|off           Stop after hitting an error.  Default OFF\n"
 +  ".binary on|off         Turn binary output on or off.  Default OFF\n"
    ".clone NEWDB           Clone data into NEWDB from the existing database\n"
    ".databases             List names and files of attached databases\n"
+   ".dbinfo ?DB?           Show status information about the database\n"
    ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
    "                         If TABLE specified, only dump tables matching\n"
    "                         LIKE pattern TABLE.\n"