From: dan <dan@noemail.net>
Date: Thu, 5 Aug 2010 16:22:49 +0000 (+0000)
Subject: Merge trunk changes with experimental branch.
X-Git-Tag: version-3.7.2~53^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4557b92cdb9f5ba13948479386f62ca45c3d9038;p=thirdparty%2Fsqlite.git

Merge trunk changes with experimental branch.

FossilOrigin-Name: acd26b8b746980c344db017a0e96dbd92c89acdf
---

4557b92cdb9f5ba13948479386f62ca45c3d9038
diff --cc manifest
index 24129bb6ba,2057083d8f..4b915c1909
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Catch\san\serror\scode\sthat\swas\snot\sbeing\spropagated\sback\sto\sthe\scaller.
- D 2010-08-05T16:08:26
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Make\sthe\ssize\sof\sa\sBitvec\sobject\s512\sbytes\son\sall\splatforms,\sinstead\sof\nhaving\sthe\ssize\sdepend\son\sthe\ssize\sof\sa\spointer.\s\sThis\smakes\stesting\seasier.
 -D 2010-08-05T11:56:01
++C Merge\strunk\schanges\swith\sexperimental\sbranch.
++D 2010-08-05T16:22:50
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -227,10 -230,10 +227,10 @@@ F src/vdbeblob.c 258a6010ba7a82b72b327f
  F src/vdbemem.c e5673f81a2381b35c60e73ef0a8502be2ab1041e
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c 82200af3881fa4e1c9cf07cf31d98c09d437e3ab
 -F src/wal.c 0925601f3299c2941a67c9cfff41ee710f70ca82
 -F src/wal.h 906c85760598b18584921fe08008435aa4eeeeb2
 +F src/wal.c 6e04bccccd75acf86725cc8cb4b107cd245e018c
 +F src/wal.h 96669b645e27cd5a111ba59f0cae7743a207bc3c
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 79202ca81e740eeb1f54512147e29b6c518d84ca
+ F src/where.c a4b2cb14dbd727ff277be3f52851425191a87f66
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 6745008c144bd2956d58864d21f7b304689c1cce
@@@ -351,9 -354,8 +351,9 @@@ F test/exclusive.test b1f9012cabc124af9
  F test/exclusive2.test fcbb1c9ca9739292a0a22a3763243ad6d868086b
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/expr.test 9f521ae22f00e074959f72ce2e55d46b9ed23f68
 +F test/fallocate.test 0594314eb04268f7d0779d054fa850a36a5ae8bc
  F test/filectrl.test 97003734290887566e01dded09dc9e99cb937e9e
- F test/filefmt.test 5d271bf467e6557fe7499dcc8203069c9dc5825e
+ F test/filefmt.test f77c92141960b7933bc6691631d2ad62257ef40a
  F test/fkey1.test 01c7de578e11747e720c2d9aeef27f239853c4da
  F test/fkey2.test e028cd80aa0bd38541c99214e3ba2dfccadffe6f
  F test/fkey3.test 42f88d6048d8dc079e2a8cf7baad1cc1483a7620
@@@ -842,7 -844,14 +842,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f99a902f9b3d0bf6f607c4ba641b4096fbbef5d5
- R 619c44a049e165e5bdd234c179e111ef
 -P fbe70e1106bcc5086ceb9d8f39cc39baf3643092
 -R a25d4976c28303b9ae9125c186188014
 -U drh
 -Z 8f5efa6fecfd7fa3fad1ed81decfa1dd
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMWqbVoxKgR168RlERAscFAJ45yMty4Qnb2iMTPTMkwlnUoOKhngCfQYvQ
 -vojbw1sglMnSTmStMZz2HhI=
 -=ZUPy
 ------END PGP SIGNATURE-----
++P 800f496929fb0d45d16c573c5dca0197ac922e2b ca479f3de2927ccc05dc76d10e40c00b8e0c88d1
++R 5a6390c995b69a7f924deee65f1b7dc5
 +U dan
- Z 4f4c91f530cb0822ccee88049df426ee
++Z 434bd8bfb5691e86b993c0ccfbfc4d4c
diff --cc manifest.uuid
index 21086831e8,7b55127e1c..c5356f714b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 800f496929fb0d45d16c573c5dca0197ac922e2b
 -ca479f3de2927ccc05dc76d10e40c00b8e0c88d1
++acd26b8b746980c344db017a0e96dbd92c89acdf