From: dan <dan@noemail.net>
Date: Wed, 15 May 2013 15:42:14 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.7.17~17^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91cf9ba339ef0521157267bbb35c970ab5c90d01;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 47dd65a890955f333d431e275f3f4d95d34a5ba5
---

91cf9ba339ef0521157267bbb35c970ab5c90d01
diff --cc manifest
index ef447dfc40,9f70a70848..e86986a31d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C When\sclosing\sa\sconnection,\savoid\stripping\sactive\scursors\sbelonging\sto\sa\sdifferent\sshared-cache\sclient.\sAlso,\sif\ssqlite3_close()\sis\scalled\swhile\sthere\sare\sstill\sactive\sstatements\sbelonging\sto\sthe\sconnection,\sreturn\sSQLITE_BUSY\sand\sdo\snot\sroll\sback\sany\sactive\stransaction.
- D 2013-05-15T10:21:50.290
 -C When\sloading\sa\sdatabase\sschema\sthat\scontains\san\sindex\sdefinition\sthat\sincludes\sa\sCOLLATE\sclause\sfor\swhich\sthe\scollation\ssequence\sis\sunavailable,\sdo\snot\sassume\sthat\sthat\sindex\suses\sBINARY\sinstead.\sFix\sfor\s[0fc59f908b].
 -D 2013-05-15T15:16:50.069
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2013-05-15T15:42:14.167
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -137,10 -138,10 +138,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c b266767351ae2d847716c56fcb2a1fea7c761c03
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c 480a6d255cc4f066029daf23dd54acf152cd0e13
 +F src/btree.c fcfbe61a311e54224b23527bbf7586ce320e7b40
  F src/btree.h 6fa8a3ff2483d0bb64a9f0105a8cedeac9e00cca
  F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
- F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176
+ F src/build.c 92ef9483189389828966153c5950f2e5a49c1182
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
@@@ -1063,7 -1063,7 +1064,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 164e3d4da20cc16d2a04d602b5a8229e0db99d9d
- R 243e9c6eef6644304141719b7b365651
 -P 8f9bd8e7a88eb11fb17d29954fa4b8c2840a5019
 -R c30a5ff0c8f241909590b400195b0165
++P 6071b7cce067c807e040283fc4b7449dc6eca498 6dae62c4e505a9a1a22c2771ef3e1921407c4748
++R 28b38b6c18b562db57488c615db697dc
  U dan
- Z 161ee496080958759a84c8cf6005b67f
 -Z 12265815702aee04d3178d81300c6ea1
++Z 6489a58ca2c2a2f6dd59b9b4bee3a760
diff --cc manifest.uuid
index 71bd9bddb9,38a7b3188e..925a4ff77c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6071b7cce067c807e040283fc4b7449dc6eca498
 -6dae62c4e505a9a1a22c2771ef3e1921407c4748
++47dd65a890955f333d431e275f3f4d95d34a5ba5