From: dan <dan@noemail.net>
Date: Wed, 28 Apr 2010 17:49:57 +0000 (+0000)
Subject: Merge two "wal"
X-Git-Tag: version-3.7.2~455^2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f032f5362ee15e58d7e1f17c45bf9b6cece815cf;p=thirdparty%2Fsqlite.git

Merge two "wal"
leaves.

FossilOrigin-Name: 13d2d5a66e9eaa81aa6314354201ee1fbd2b3824
---

f032f5362ee15e58d7e1f17c45bf9b6cece815cf
diff --cc manifest
index eccf56fa3e,e87f3103a8..23a34d1f78
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Change\swalthread.test\sso\sthat\stests\scan\sbe\srun\swith\seither\smultiple\sthreads\sor\smultiple\sprocesses.
- D 2010-04-28T17:48:44
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Changes\sto\sthe\sinterface\sdesign\sfor\sthe\sxShmLock\smethod\sof\sthe\sVFS.
 -D 2010-04-28T17:21:33
++C Merge\stwo\s"wal"\nleaves.
++D 2010-04-28T17:49:57
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -221,8 -224,8 +221,8 @@@ F src/vdbeblob.c 5327132a42a91e8b7acfb6
  F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
 -F src/wal.c 1576b36d55220d42598a5fb48a06e083efecea75
 +F src/wal.c d63318e8e73f9ed1a6f3c277f71022024f38a7c3
- F src/wal.h 812101dd76610401fbcd44114e7e8b7ce0224645
+ F src/wal.h c60781e78e394af07ece3b64a11192eb442241c1
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -761,10 -764,10 +761,10 @@@ F test/vtab_shared.test 0eff9ce4f19facb
  F test/wal.test bc99b1656b721fddd2dfeea0b0e77b147e40e6da
  F test/walbak.test f6fde9a5f59d0c697cb1f4af7876178c2f69a7ba
  F test/walcrash.test f022cee7eb7baa5fb898726120a6a4073dd831d1
- F test/walhook.test 76a559e262f0715c470bade4a8d8333035f8ee47
+ F test/walhook.test 287a69d662939604f2e0452dace2cec8ef634d5e
  F test/walmode.test 40119078da084e6a7403ba57485d5a86ee0e2646
  F test/walslow.test 38076d5fad49e3678027be0f8110e6a32d531dc2
 -F test/walthread.test a7962d8b899366cc71f8381d9aeab8ae9e1b544d
 +F test/walthread.test 871aeecc5b89133b094bcc00c4fcfa040749c726
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 45eacc126aabb37959a387aa83e59ce1f1f03820
  F test/where3.test aa44a9b29e8c9f3d7bb94a3bb3a95b31627d520d
@@@ -808,7 -811,14 +808,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8c2d43babd61fe2225d5c402174253f412604092
- R 797336faa9830e538744894acb6ac97d
 -P bbc385111b19071e20fe963fab814262c815b3e9
 -R 8707e56d2016564dc168df33cbfc8185
 -U drh
 -Z 76427138e798af79dc3cb019d4766cfc
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFL2G6foxKgR168RlERAj6qAJ4tUzbbIOEurzGhDqNlV4AMpvLtEgCfaPHT
 -5y4JLRgmNxCyywDyaIJzD+o=
 -=+YQ0
 ------END PGP SIGNATURE-----
++P 25f85f68723e56c18e44b094d85f67b99912dc86 348409de26eafe12f5cb1236e8e167a4183d4051
++R 39134c2ac17dc2dba6c744dfce94f1bb
 +U dan
- Z 5512df46d9c359853729f7512b676a72
++Z 83204dbbb275bd731c15521fddcf192e
diff --cc manifest.uuid
index f5bda9e6dc,aa96371448..6103307f91
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 25f85f68723e56c18e44b094d85f67b99912dc86
 -348409de26eafe12f5cb1236e8e167a4183d4051
++13d2d5a66e9eaa81aa6314354201ee1fbd2b3824