From: dan <dan@noemail.net>
Date: Sat, 3 Jul 2010 13:50:11 +0000 (+0000)
Subject: Fix an assert in pager.c. And various test cases that fail with the in-memory journal... 
X-Git-Tag: version-3.7.2~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c844a0368a490c7ba505570525323b693ce7a006;p=thirdparty%2Fsqlite.git

Fix an assert in pager.c. And various test cases that fail with the in-memory journal permutation.

FossilOrigin-Name: 622378dbe3941f06c717c1e272cd1190e4358428
---

c844a0368a490c7ba505570525323b693ce7a006
diff --cc manifest
index 1db97208fc,9dda2f0fe0..d490b0d92d
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Cherry-pick\sthe\scorrect\schanges\sout\sof\sthe\srecent\s"mistake"\sbranch\swhile\nomitting\sthe\sbogus\schanges.
- D 2010-07-03T12:31:35
+ C Fix\san\sassert\sin\spager.c.\sAnd\svarious\stest\scases\sthat\sfail\swith\sthe\sin-memory\sjournal\spermutation.
 -D 2010-07-03T13:45:53
++D 2010-07-03T13:50:12
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -833,14 -830,7 +830,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P dafb3577a2d5fbeebb17c8176af837f0aebf6ee5 7cbe175a69738499f9218ec56f1a39f040aea9dc
- R d0b007e2ef9688923f10274954448b62
- U drh
- Z 9ed89a67888dd059d0adfcf46fe44cff
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD4DBQFMLy2qoxKgR168RlERAgB/AJjRY22W8BVzKcuM5rE4E50Yg6ZtAKCKl5Ee
- AuDXrVc9U2hm2JSf79toLw==
- =6dms
- -----END PGP SIGNATURE-----
 -P 7cbe175a69738499f9218ec56f1a39f040aea9dc
++P 48bf309391c32e7860c293acd13f3dda14212d39 78fc35ff4b01d4a583009ec8b8bf876738ca7b92
+ R c5e0f625cc36dd57b9413db473409eda
+ U dan
 -Z 7660b7f8316180874f8f1a941691e23e
++Z 137523870678e545b0e8f002ec3d64ab
diff --cc manifest.uuid
index cff5c849cd,e572498c29..28838b45d1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 48bf309391c32e7860c293acd13f3dda14212d39
 -78fc35ff4b01d4a583009ec8b8bf876738ca7b92
++622378dbe3941f06c717c1e272cd1190e4358428