From: dan <dan@noemail.net>
Date: Fri, 30 Apr 2010 06:02:30 +0000 (+0000)
Subject: Merge latest bugfix into wal branch.
X-Git-Tag: version-3.7.2~455^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5047af405bcb5bf0f4fb4c98e884b7020ffdf204;p=thirdparty%2Fsqlite.git

Merge latest bugfix into wal branch.

FossilOrigin-Name: 265e66e6984c32999bf93981e3b1d19887dfe599
---

5047af405bcb5bf0f4fb4c98e884b7020ffdf204
diff --cc manifest
index d3df686025,a060cc1b2a..f1b485ae53
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,7 +1,7 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C The\sfirst\s6\sWAL\stests\snow\swork.\s\sIt's\sa\sstart.
- D 2010-04-30T02:13:27
 -C Zero\sthe\s"immediate\sFK\sconstraint\scounter"\sassociated\swith\sa\sstatement\sobject\swhen\ssqlite3_reset()\sis\scalled.\sFix\sfor\s[c39ff61c43].
 -D 2010-04-29T22:57:56
++C Merge\slatest\sbugfix\sinto\swal\sbranch.
++D 2010-04-30T06:02:31
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 -F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 +F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks ab005d301296c40e021ccd0133ce49ca811e319f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -215,11 -212,11 +212,11 @@@ F src/update.c c0dc6b75ad28b76b619042d9
  F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
  F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
  F src/vacuum.c 8e7d9a6fd076774bb6e211cad335c7337948a164
 -F src/vdbe.c 2abd931ea2aec3eacc6426677f40cc5a1071d34e
 +F src/vdbe.c 21a96eeeb43dedd40072028db0b42e137296a81a
  F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
  F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
 -F src/vdbeapi.c 11bcc381e81e797fcf3e81fa6a14ec16a04801cc
 +F src/vdbeapi.c 85e448c7d1d6dde7226c721cd8da8f9b5286699d
- F src/vdbeaux.c be6ca4bb330c7730b358dd627d6d632ca93482c9
+ F src/vdbeaux.c 395d21a1617553ea9b9f4abe0d302449d8549e1d
  F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
  F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
@@@ -811,14 -798,7 +808,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 62db5fa3b61be885b2d94e9b9ce3877b2c588350
- R aef0120cea29fe330250fe68f6819085
- U drh
- Z 4fcebc28f74cfe3c8cf3e566a4608163
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFL2jzNoxKgR168RlERAgWeAJ95gf+z42nfTDpmaeXk9ZGzWPlbxwCdFTJp
- +xaXsShNpvEvsgzl2lnGlxE=
- =76cZ
- -----END PGP SIGNATURE-----
 -P ca9d86baf70f210d331ce93102177c8005c494cb
 -R a059ba0054bf8b8b3e167094c8be4a0d
++P a92c1851da10acf51e7f6f086b8a23bd731940b3 f660be615a0c1f4641782a83744533f5d3119218
++R 789557e2ecf4320c154527de09c21ada
+ U dan
 -Z cbcb2b19feabf4740bc2edb9662818e3
++Z b95a42f00187a9dd3e8e01985f34fa1c
diff --cc manifest.uuid
index da28f90e44,920efd4abf..85d7bc1b3c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a92c1851da10acf51e7f6f086b8a23bd731940b3
 -f660be615a0c1f4641782a83744533f5d3119218
++265e66e6984c32999bf93981e3b1d19887dfe599