From: dan <dan@noemail.net>
Date: Tue, 1 Jun 2010 14:30:49 +0000 (+0000)
Subject: Merge with [15abbc3416].
X-Git-Tag: version-3.7.2~328^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fwal-incr-ckpt;p=thirdparty%2Fsqlite.git

Merge with [15abbc3416].

FossilOrigin-Name: f4b9003a2d3db88eaabb4b291e6cea8e8ea6ff51
---

98fbfe703e6815c90006cafe022503a834264e58
diff --cc manifest
index 7c8b68cbce,a45dddeda6..ee1b6b0194
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C If\san\sattempt\sto\sget\sa\sread-lock\son\sthe\sWAL\sfails\swith\sSQLITE_BUSY_RECOVER,\scall\sthe\sbusy-handler\sat\sthe\sbtree\slevel.
- D 2010-06-01T14:12:45
 -C Changes\sto\sthe\sway\sone\sof\sthe\sWAL/OOM\stests\sworks.
 -D 2010-05-31T06:38:35
++C Merge\swith\s[15abbc3416].
++D 2010-06-01T14:30:49
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -815,7 -815,7 +815,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 9c9ec8994bf701249efce6c7bb911de4525808c8
- R 2b521b04f3b51086c8477471cd905ca9
 -P e9e5b1001986348ef0f88c19de87b94559a5451e
 -R f3f15c95e56f90189266a174fb626d53
++P ce64496509a213c08c9dedae2a7a456b393d22e5 15abbc34168f7a5bd418254c2b16aac97029e6ea
++R 858d8d9dc0b3efa473b8ec6d14fcb8f5
  U dan
- Z 5cf352c78c887b69611dfdbc185b73d6
 -Z 4fade6b535eae7f88d92509f7fe17c62
++Z 93dba21d700df76a7de6004be75fceac
diff --cc manifest.uuid
index 9ce03d560b,e3f39cee60..f6c06d2325
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ce64496509a213c08c9dedae2a7a456b393d22e5
 -15abbc34168f7a5bd418254c2b16aac97029e6ea
++f4b9003a2d3db88eaabb4b291e6cea8e8ea6ff51