From: drh <drh@noemail.net>
Date: Tue, 11 Feb 2014 16:31:14 +0000 (+0000)
Subject: Sync with trunk.  Bring in the command-line shell updates and the new 3.8.4
X-Git-Tag: version-3.13.0~148^2~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15d4211400da2ac47e226d276eea91701650e0ee;p=thirdparty%2Fsqlite.git

Sync with trunk.  Bring in the command-line shell updates and the new 3.8.4
version number.

FossilOrigin-Name: 2cd35ff6512e1973077f7ffc2c902476eabbe672
---

15d4211400da2ac47e226d276eea91701650e0ee
diff --cc manifest
index 893421118b,19a6fafab1..95a9a2733e
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Sync\sthe\slatest\strunk\schanges,\sand\sin\sparticular\sthe\sSTAT4\sIS\sNOT\sNULL\sfix.
- D 2014-02-11T04:30:29.995
 -C Increase\sthe\sversion\snumber\sto\s3.8.4
 -D 2014-02-11T16:24:34.448
++C Sync\swith\strunk.\s\sBring\sin\sthe\scommand-line\sshell\supdates\sand\sthe\snew\s3.8.4\nversion\snumber.
++D 2014-02-11T16:31:14.706
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 6ff3ff2eef45c7dd309a8626ff7947b20bd387e7
 +F Makefile.msc 71dd5335d266351598e51f2d694396db2a2e219f
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73
+ F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -234,11 -220,11 +234,11 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 50961f0d0ab8f2d45ff29ec5f91d8db221330ca7
- F src/shell.c 7dedf7367ee49050b0366bf8dbc8ec2bd15b42c7
+ F src/shell.c 3dd86bf73ccd079f0e32ef5069600586085e8239
 -F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 +F src/sqlite.h.in a92d7fcdcb1a8003a62e916ec49025f27ccb56b8
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 5b1f4e30c8332270e4c14254ef1fbcbd92a4a4c7
 +F src/sqliteInt.h 2c9a421de05893c798b851004658b12e9843c0f7
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1168,7 -1153,7 +1168,7 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P a704b65b9476d60c88b5bc82f2743faa2bce5ac2 c950d6c4117d076f871518e738cdf9e8c46a19fc
- R 938a4c92585daead803d3d317e7d6a12
 -P f5ad1e1bf2828c5da70c1ff944d8212036142e6f
 -R 07c665af95e97929880dcb47f3f495f9
++P b006792695d23980e1923b21915d5c1138ecf29d 0a8bcbbd4e11a60923736b2be9b1ce83ea2263fb
++R 7d2fb347996fe34e28958e66dfeb20fe
  U drh
- Z d6bfa33b9fae0786f865ca76b023abf9
 -Z 585a1fb26982d5587e4e3f114773e866
++Z 8dc7cf7da8fba0cbde1ad37473fe5303
diff --cc manifest.uuid
index 472e500acc,a4c42c8f7f..cbdc5a1e4a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b006792695d23980e1923b21915d5c1138ecf29d
 -0a8bcbbd4e11a60923736b2be9b1ce83ea2263fb
++2cd35ff6512e1973077f7ffc2c902476eabbe672