From: drh <drh@noemail.net>
Date: Fri, 7 Mar 2014 14:36:50 +0000 (+0000)
Subject: Merge the fix for the journal_mode=PERSIST error recovery delay bug.
X-Git-Tag: version-3.13.0~148^2~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e2f4599874d36fb4c706afb841b2fd719090b36;p=thirdparty%2Fsqlite.git

Merge the fix for the journal_mode=PERSIST error recovery delay bug.

FossilOrigin-Name: bb6a75f4bbcaaabc3ad47992c7c87868c70e8daf
---

4e2f4599874d36fb4c706afb841b2fd719090b36
diff --cc manifest
index 8f664024a5,9e997b1eb1..ab6faa63a0
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\sharmless\scompiler\swarning\sin\sthe\ssessions\stest\sharness.
- D 2014-03-06T15:01:11.376
 -C Revise\schange\sfrom\sthe\sprevious\scheck-in\sto\sclarify\sthe\ssituation\swhen\shandling\sopen\sjournal\sfiles,\sregardless\sof\sjournal\smode.
 -D 2014-03-07T03:31:35.143
++C Merge\sthe\sfix\sfor\sthe\sjournal_mode=PERSIST\serror\srecovery\sdelay\sbug.
++D 2014-03-07T14:36:50.554
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
@@@ -1170,7 -1155,7 +1170,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P bc0e661033b78f27866932244e6204985ae39000
- R 973bedbe61265104f3741c995c452b29
 -P fdc651e2ec7a0babee669e24fd56632e7cd5f0e9
 -R dd6c54a8aa52f6e2a8e41a668b913ede
 -U mistachkin
 -Z 7a2dfaabd9df7aaa8958f21cc25c2459
++P d389e20ab07a76d0c4be3801265977fa977a4394 1c318ef3b76e9a9a5ff2f156a9acddfc1bda0949
++R 11d40879c4a4163bd84e04c80c6b51aa
 +U drh
- Z 1571e450ec5231b885fc926309559de1
++Z 5baca92522a934140dc6eba1ba109b11
diff --cc manifest.uuid
index 04ddcd160e,13a19cc1e7..0ae72b7d62
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d389e20ab07a76d0c4be3801265977fa977a4394
 -1c318ef3b76e9a9a5ff2f156a9acddfc1bda0949
++bb6a75f4bbcaaabc3ad47992c7c87868c70e8daf