From: mistachkin <mistachkin@noemail.net>
Date: Mon, 29 Apr 2013 08:56:49 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.7.17~24^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84edc19a67d59a27d33363558c326d597ff71309;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 3a245a832d4843802c3c57f8cda3e4e1d0d52622
---

84edc19a67d59a27d33363558c326d597ff71309
diff --cc manifest
index f3ffcbc3c7,3db186dfa5..58c96ec2af
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\srefinements\sto\sWindows\sOSTRACE\susage.\s\sReplace\sall\susage\sof\ssqlite3TestErrorName()\swith\ssqlite3ErrName()\sand\sadd\smissing\sreturn\scodes.
- D 2013-04-29T03:09:10.647
 -C Update\s'fuzzerfault'\stest\sfor\sits\snew\smodule\sloading\scommand.\s\sFix\sseveral\stest\snames\sin\s'io.test'\sand\smake\ssure\sthe\sdatabase\sgets\sclosed\sbetween\stests.
 -D 2013-04-29T07:01:23.073
++C Merge\supdates\sfrom\strunk.
++D 2013-04-29T08:56:49.008
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1060,7 -1060,7 +1060,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 b347b5d1a01301f44e6fd20ee03a9529ffd25788
- R b3ab158a0ee89a318d762b36a446cf00
 -P adcf78909ff9064b6e3c4dd15ccd3245c8cf270b
 -R 263b9a6fce3f45179cbdd8291a5dbd19
++P 05ba5e23fcc5da416d47a8ad5e667ed6a0c7a34a e81e9ca11db09424dd310bbc91686a5daa618cb1
++R cbea6b19af175a78e920dc5a0be06f24
  U mistachkin
- Z 697f524cff7a4e0ba7e5e291adbbfd2e
 -Z c1a76ab097fbf09032c65307a2000f74
++Z c57c4f0f878083d5f09ceb7503607ae1
diff --cc manifest.uuid
index e16bd538ae,d77da23add..5d4dbaeefe
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 05ba5e23fcc5da416d47a8ad5e667ed6a0c7a34a
 -e81e9ca11db09424dd310bbc91686a5daa618cb1
++3a245a832d4843802c3c57f8cda3e4e1d0d52622