From: drh <drh@noemail.net>
Date: Mon, 18 Aug 2014 13:48:41 +0000 (+0000)
Subject: Merge the latest trunk changes, and in particular the refactoring of the
X-Git-Tag: version-3.13.0~148^2~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b7a2e3a1e9b373a1174ee84feb818fd2df01bdf;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes, and in particular the refactoring of the
object names in the command-line shell.

FossilOrigin-Name: 419d286a2fc465f6e0f9662909d0cc52a18eefa4
---

8b7a2e3a1e9b373a1174ee84feb818fd2df01bdf
diff --cc manifest
index 6060acbd59,6b5562f42e..84f92a5c48
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\stests\sfor\ssessions\smodule.
- D 2014-08-18T08:42:36.985
 -C Refactor\sthe\snames\sof\sstate\sobjects\sin\sthe\scommand-line\sshell\simplementation..
 -D 2014-08-18T13:45:42.156
++C Merge\sthe\slatest\strunk\schanges,\sand\sin\sparticular\sthe\srefactoring\sof\sthe\nobject\snames\sin\sthe\scommand-line\sshell.
++D 2014-08-18T13:48:41.625
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -238,11 -223,11 +238,11 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
  F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea
- F src/shell.c 75bb7bd2c80bb44861598f322a417c4bafe98fd7
+ F src/shell.c 41df1103617331e023301d943977f8c06bd1486f
 -F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
 +F src/sqlite.h.in 021a1f5c50e83060675d994a6014fd409e611d9e
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
 +F src/sqliteInt.h d60dbbadfd64374a5a2f362fc6f45899540c2c8e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1202,7 -1186,7 +1202,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 05c1d9149b27c68e2654ed28491722927d2176f5
- R 03b8d5b2540614bccade3685e83e41dc
- U dan
- Z cda8ef5f85a6d704893f36da729451e0
 -P 28a379fcd43389ad3249eff51a621d0bb7c81640
 -R ef518fe403795d3b06bbe754ecf5c125
++P 82fdb1975f5b29a751089a8582713372999ae56e 11a70e1ae7f05d06e4e09c9d20db0444b8881584
++R 9eb07c2c47c345635567e1ec3d8ef22d
+ U drh
 -Z e00f86954fa90c49bf5a476ef91fbb0c
++Z 44d5fceffc6c6ae323a3b362c9fccbd4
diff --cc manifest.uuid
index 01d5ecc3e5,e975bd8d97..3f8761cf9d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 82fdb1975f5b29a751089a8582713372999ae56e
 -11a70e1ae7f05d06e4e09c9d20db0444b8881584
++419d286a2fc465f6e0f9662909d0cc52a18eefa4