From: dan <dan@noemail.net>
Date: Wed, 29 Jan 2014 14:21:31 +0000 (+0000)
Subject: Merge latest fixes from the trunk.
X-Git-Tag: version-3.13.0~148^2~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43a6c6b2d4e0c037a8881d8e07de5abccfc24364;p=thirdparty%2Fsqlite.git

Merge latest fixes from the trunk.

FossilOrigin-Name: 6b6dcd4cc75317628072abac7c58b41361cc72b4
---

43a6c6b2d4e0c037a8881d8e07de5abccfc24364
diff --cc manifest
index c0f7eb06a7,1cd51063f2..7ecac84a19
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Bring\sin\sthe\slatest\supdates\sfrom\strunk.
- D 2014-01-28T18:06:17.362
 -C Make\ssure\sthat\ssqlite3SelectDup()\sinitializes\sthe\snSelectRow\sof\sthe\nduplicate\sSelect\sobject.
 -D 2014-01-29T01:46:12.389
++C Merge\slatest\sfixes\sfrom\sthe\strunk.
++D 2014-01-29T14:21:31.405
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 4d4ead6b71d1bf03028fbd61da0ba0ec5e1556e1
 +F Makefile.msc 043280f9ca15befa7236484a6c1448d9271abd73
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73
@@@ -188,8 -174,8 +188,8 @@@ F src/callback.c 174e3c8656bc29f91d710a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
- F src/delete.c 85592961a0bef547562468c9496a56f3997b3c30
- F src/expr.c 96f00a262308f3f97d2afd8519c7a284e25829f3
 -F src/delete.c d784e2ee2c6e90fbbd9dcf88a2030c9e12a9318d
++F src/delete.c a3f2007baa239c6e1fc3246cf366febd24c1a12e
+ F src/expr.c e3e09af908b968305d4efeda8dc3499a087ee7d2
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 2ab0f5384b70594468ef3ac5c7ed8ca24bfd17d5
  F src/func.c f4499b39d66b71825514334ce67b32ff14bd19f5
@@@ -1167,7 -1152,7 +1167,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 9b43e559195680e558264c4c00d34dc9cf9d9146 5e3b9ecc7b2b2e50952de819b99bafdb7b9ff59e
- R 51002a148d222844524dcb7bb9208985
 -P 27c27daa3324b7c9323acfb972330367630bb64e
 -R f049cadfe79d3cfbcc34d51b06338c39
--U drh
- Z 1a524338f4286caad02c997553ac895a
 -Z 40ce23bc9f3b9d3c5fa7bebae22e1b10
++P 7b5f3773867ed0e4ed17bd473ba972d500035318 5bb29b82109224a2ad02920658fabd8fb0f27b3f
++R 432574c0dd840817debf508c99b1ccfe
++U dan
++Z 2459ddf115f614b7a3ba484263d1245a
diff --cc manifest.uuid
index 2dcd6ffc1d,a9b235c6f0..d587a3dc0e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7b5f3773867ed0e4ed17bd473ba972d500035318
 -5bb29b82109224a2ad02920658fabd8fb0f27b3f
++6b6dcd4cc75317628072abac7c58b41361cc72b4