From: drh <drh@noemail.net>
Date: Fri, 6 Feb 2015 15:03:45 +0000 (+0000)
Subject: Merge the command-line shell enhancements from trunk.
X-Git-Tag: version-3.8.11~252^2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00dbc89824f719a27001a56c1b40840924fc2cbc;p=thirdparty%2Fsqlite.git

Merge the command-line shell enhancements from trunk.

FossilOrigin-Name: c3931db560ab4a2601c7f7318fb02c8d5e6862b1
---

00dbc89824f719a27001a56c1b40840924fc2cbc
diff --cc manifest
index a07f7ba90c,b31e5b6454..4d69256b43
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Revise\sthe\sway\sthat\sthe\sindex\sstructure\sfor\sa\sWITHOUT\sROWID\stable\sis\ndiscovered.
- D 2015-02-06T00:31:45.481
 -C Change\sthe\sname\sof\s".info"\sto\s".dbinfo"\sand\sadd\san\soptional\ssecond\sargument\nwhich\sis\sthe\sATTACH-ed\sDB\sabout\swhich\sinformation\sis\sprovided.\s\sProvide\n".indexes"\sas\san\salternative\sname\sto\sthe\slegacy\s".indices"\scommand.
 -D 2015-02-06T14:51:13.355
++C Merge\sthe\scommand-line\sshell\senhancements\sfrom\strunk.
++D 2015-02-06T15:03:45.342
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -246,11 -231,11 +246,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc
- F src/shell.c 22b4406b0b59efd14b3b351a5809dda517df6d30
+ F src/shell.c 82c25508dac802b32198af6f5256ca1597c6a1af
 -F src/sqlite.h.in 54678c21401909f72b221344dd560d285a1ba5eb
 +F src/sqlite.h.in 4807b024e8d257af774cde0cf178f721ff2406ec
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h c4e05f7489cd300f856e2283d5e61302ce826471
 +F src/sqliteInt.h 57f8f45028598cc2877fc08ac03b402242242c68
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1255,7 -1239,7 +1255,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 a5e86bea4ad51bbb988a2a2215961706894f4a02
- R cf9fe799f99a90eb0a6f043505cb4c1a
 -P 0a3100a7f264ffce6078c35e341f2f0af6c09fbb
 -R a582dddcff23f4b3aa0ab625ed7ba566
++P 7f10a0eaf1fedfa020cbd7019ec9342ffdc3b9b0 0f65a7e2e09f801b66897479d501607caeae4abf
++R 1ef390b8e8775fda79ba88277a4a2044
  U drh
- Z c0c25c22927eb0667b2fe51c91fe6714
 -Z 91c27780af6a4d5e0c7b8a8aa90c189d
++Z f716caa3559c7f56ae8a7035846f96fb
diff --cc manifest.uuid
index 2cf1a922f1,408d77792f..67420b8cdc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7f10a0eaf1fedfa020cbd7019ec9342ffdc3b9b0
 -0f65a7e2e09f801b66897479d501607caeae4abf
++c3931db560ab4a2601c7f7318fb02c8d5e6862b1