From: drh <drh@noemail.net>
Date: Wed, 2 Jan 2013 12:29:05 +0000 (+0000)
Subject: Merge all the latest trunk changes into the name-resolution enhancement branch.
X-Git-Tag: version-3.7.16~87^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d530ee64caeaf102e8a888e12290b1436c0ed2b0;p=thirdparty%2Fsqlite.git

Merge all the latest trunk changes into the name-resolution enhancement branch.

FossilOrigin-Name: a5f4d2b641f7fafb6f1a312efeffb10f213d2d0a
---

d530ee64caeaf102e8a888e12290b1436c0ed2b0
diff --cc manifest
index f327e2ee10,3b88cb1f55..7be42d45bf
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\scommentary\sto\sthe\sExprList\sobject\sto\sexplain\show\szSpan\sis\soverloaded.\nAdd\stest\scases\sfor\sthe\snew\sname\sresolution\sfunctionality.
- D 2012-12-19T13:41:03.688
 -C Reduce\sthe\ssize\sof\sthe\sIndex\sobject\s(by\s8\sbytes\son\sx64).
 -D 2013-01-01T14:01:28.252
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sname-resolution\senhancement\sbranch.
++D 2013-01-02T12:29:05.642
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
+ F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5a3b6f34d263b01f8b798c291fac1529fd650308
+ F Makefile.msc 2b8371775ea8df029d1acf0c3d4c3782d3bd5711
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@@ -172,14 -172,14 +172,14 @@@ F src/pragma.c 8907c559d3127729d3bcedb1
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 -F src/resolve.c 52331299f4095397d6d00715b70cd153baa11931
 +F src/resolve.c 3104a5e4c2cb6e3a813b7266cbd541dc91e26fad
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c 5eab6941c0ac97355817f846b77cd20bfdf5a82e
 +F src/select.c 3cce5b09cae6eaf23276bb2e5551a9d22cd7ae3d
- F src/shell.c e392dd1ccbb77cc1d75a8367a89b473c24bea019
+ F src/shell.c 11c9611580bb2ffce3a232f31f7f8cc310df0843
  F src/sqlite.h.in 39cc33bb08897c748fe3383c29ccf56585704177
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h c708c868f10c491bd32a7e1210f4a314448fa728
 -F src/sqliteInt.h 2091fb64a2274434a791951cb97ef8b1bd44c29b
++F src/sqliteInt.h 2ce2d742e32be86bf1fc8e29c91ef91c29c32e60
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1027,7 -1030,7 +1031,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 7344e791b9456286ecdca6d45f2f5260fb3f10e2
- R be36637b6c87220d87a455d3dd649bed
 -P 3076a89015071e9b40e728bd55160e3a6ed98820
 -R ec755f0b3e93517441aaf44db561d61d
++P 3e7d84db7861911c9b2c7dcdabe0b213bf483d79 5a2ac944839ec0c5b9147a035c6cbf0935f3d202
++R b00123b22cae8fcb124aaeac1cbbab83
  U drh
- Z 4a19eec8d8a61f22fdf7238cb2d39c20
 -Z 0e046cc23277e52323ecef741dd3466e
++Z 0dd559531357e580f4a230ac4f1af1d6
diff --cc manifest.uuid
index 47a5e32c0e,522d4edbae..d30551697b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3e7d84db7861911c9b2c7dcdabe0b213bf483d79
 -5a2ac944839ec0c5b9147a035c6cbf0935f3d202
++a5f4d2b641f7fafb6f1a312efeffb10f213d2d0a