From: dan <dan@noemail.net>
Date: Wed, 13 Mar 2013 06:34:51 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Tag: version-3.13.0~148^2~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfb5a031e5e01fae62341fc30cfc1d559c256ba8;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: d6cd3c780c6bc718d37e0f0b884e3e9a423d57be
---

bfb5a031e5e01fae62341fc30cfc1d559c256ba8
diff --cc manifest
index dda8425088,b60645888e..53fce838c5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\schanges\sto\strunk\sinto\ssessions\sbranch.
- D 2013-03-12T11:38:59.574
 -C Fix\sthe\sORDER\sBY\swith\sIN\sconstraint\slogic\sso\sthat\sit\sworks\swith\sall\ncombinations\sof\sDESC\son\sthe\sORDER\sBY\sclause,\son\sthe\sRHS\sof\sthe\sIN\soperator,\nand\sin\sthe\sindex\sused\sby\sORDER\sBY\sand\sIN.\s\s\nFix\sfor\sticket\s[4dd95f6943fbd18].
 -D 2013-03-13T00:13:25.181
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2013-03-13T06:34:51.061
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -141,8 -129,8 +141,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
 +F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
- F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
+ F src/expr.c d488bb60e54c9305d9fca1fa6fcc7bfbd23b13a2
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
  F src/func.c 48987c025d69399f59a1c2a553cea5da41bf105d
@@@ -188,10 -176,10 +188,10 @@@ F src/resolve.c 9079da7d59aed2bb14ec831
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
  F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
- F src/sqlite.h.in 7c9b66c397025a9e93e1ec1faa03324b757a2880
 -F src/sqlite.h.in f2fa32f440dda59ca47e22889966b2a6eb3b491c
++F src/sqlite.h.in 095fc633527cb18e5196ea5adc31370dc6aa389e
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
- F src/sqliteInt.h 8515d149d4b20fb89d4c5bd2ce57f005e4ced42f
 -F src/sqliteInt.h 0f8f05ee4db4ba9120b38f7a3992b325698f6e8a
++F src/sqliteInt.h a0a6b155f5e9748dfb5876d892e03a07eb056d7b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1050,7 -1038,7 +1051,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 d69d21903b883067c66dbcdefe6b369a6fe328b0 f9027cb47bdec8dcebf1f038921b28d9e9928c18
- R f222f57c93ab273cf35121a2470c5e52
 -P c9a75d890f06cf3806d7b8879824a11d3a8e7016 7e7356f1552cd53ea363d1ded3b2c221c9d0be01
 -R cf70d6af777786d8b14ff574243c0031
 -U drh
 -Z ef3fb703f5f65c616953904db1b81e9f
++P 62adb0e0d70e619becb68ffd2625d979bcc777cd 839aa91faf1db7025d90fa3c65e50efb829b053b
++R f971c8bcbe5e7e01d3f1960cb48792c9
 +U dan
- Z c5f2b4d72ddf45f3699f5c346c8949b7
++Z 72580c54b4ef9e18ca4a1b86983b9c48
diff --cc manifest.uuid
index a0ef93ed7e,31a34e8a08..5a3c033a66
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 62adb0e0d70e619becb68ffd2625d979bcc777cd
 -839aa91faf1db7025d90fa3c65e50efb829b053b
++d6cd3c780c6bc718d37e0f0b884e3e9a423d57be