From: drh <drh@noemail.net>
Date: Thu, 30 May 2013 11:48:36 +0000 (+0000)
Subject: Merge recent trunk changes into the NGQP branch.
X-Git-Tag: version-3.8.0~130^2~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1e9766dee92759d19d8594771d08616341f5a9f;p=thirdparty%2Fsqlite.git

Merge recent trunk changes into the NGQP branch.

FossilOrigin-Name: aebe1f2603ee04d792af73aaf59625bda99d5cd1
---

e1e9766dee92759d19d8594771d08616341f5a9f
diff --cc manifest
index 8b6a0ac134,ad8661af94..39a8c39490
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Update\sthe\sNGQP\sto\srecord\swhich\sloops\sneed\sbe\srun\sin\sreverse\sorder\sto\nsatisfy\sORDER\sBY\sclauses.
- D 2013-05-27T17:59:37.917
 -C Updates\sto\sthe\sCodec\sinterface\sto\ssupport\scodecs\son\sattached\sdatabases\sand\nto\sallow\srekeying\sin\sthe\smiddle\sof\sa\stransaction.\s\sThese\schanges\sare\sonly\s\napplicable\sif\sSQLite\sis\scompiled\swith\sSQLITE_HAS_CODEC.
 -D 2013-05-29T17:48:28.829
++C Merge\srecent\strunk\schanges\sinto\sthe\sNGQP\sbranch.
++D 2013-05-30T11:48:36.654
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
+ F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5dc042f51187414d5886ac6d8308630d484690c4
+ F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@@ -191,12 -215,12 +215,12 @@@ F src/printf.c bff529ed47657098c55c9910
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
+ F src/select.c 22ee971346a736ddefdc4497d07c92f2e9978afc
  F src/shell.c 9a18124ff209ca308d786c99a466e8e270193ff3
- F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
+ F src/sqlite.h.in 5b390ca5d94e09e56e7fee6a51ddde4721b89f8e
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h 9e12a56e05420b5c7aa40aca4d44ee4d9535b68a
 -F src/sqliteInt.h 46fb17f604ce941551fe64c342dbeb4dbed3edaa
++F src/sqliteInt.h 55f43f10f165c8c17334e33a11b2d58a557b4a2c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1066,7 -1093,7 +1093,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P b49fa74561f38c945be6149693678fd6518c2de4
- R dbfb376dc6b826c13c37ea187ec4a9c4
 -P 09e5a7ad85dc592fce868a2d0f8719c6915ccb47
 -R 20090ed5100bc7738631061b2f74235f
++P 211f7a5374fe20a02535edc8b799a8a7136ff6b3 d5b084e9d8cfe9c0c339aca076d472bb50aa764c
++R 6c4c190a12a33f58ef606f4f8676d338
  U drh
- Z 716f8aec8e11bc86fa358274cd806e0b
 -Z caf68d1d5a539a495dd90cbaf5a54682
++Z e692c34c627e293c83ac7dc20bf238bc
diff --cc manifest.uuid
index a1b72955fd,e0da117f05..eeb2053b55
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 211f7a5374fe20a02535edc8b799a8a7136ff6b3
 -d5b084e9d8cfe9c0c339aca076d472bb50aa764c
++aebe1f2603ee04d792af73aaf59625bda99d5cd1