From: dan <dan@noemail.net>
Date: Thu, 17 Jun 2010 06:19:53 +0000 (+0000)
Subject: Merge fix [f80c3f922a] with experimental changes.
X-Git-Tag: version-3.7.2~256^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c00251807484a735558da4f4bf9b3950bea2c31e;p=thirdparty%2Fsqlite.git

Merge fix [f80c3f922a] with experimental changes.

FossilOrigin-Name: 20133e9ca98f5e6c42051ed3d65e4eb71d5366a5
---

c00251807484a735558da4f4bf9b3950bea2c31e
diff --cc manifest
index 8919437c24,f7fc681bf9..0a38a292c6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Experimental\schange:\sOn\ssystems\swhere\sit\sis\snot\spossible\sto\sunlink\sa\sfile\swhile\sone\sor\smore\sprocesses\shas\sit\sopen\s(i.e.\snot\sunix),\savoid\sclosing\sthe\sjournal\sfile\seach\stime\sthe\sdatabase\sis\sunlocked\sand\sreopening\sit\sat\sthe\sstart\sof\seach\stransaction.
- D 2010-06-16T19:04:23
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Bug\sfix:\s\sOnly\strust\sthe\sdatabase\ssize\snumber\sat\soffset\s28\sif\sthe\schange\ncounter\sat\soffset\s24\smatches\sthe\sversion\snumber\scounter\sat\soffset\s92.\nThis\sprevents\scorruption\sin\sthe\scase\sof\stwo\sapplications\swriting\sto\sthe\ndatabase\swhere\sone\sis\san\solder\sversion\sof\sSQLite\sand\sthe\sother\sis\sa\snewer\nversion.
 -D 2010-06-17T02:13:40
++C Merge\sfix\s[f80c3f922a]\swith\sexperimental\schanges.
++D 2010-06-17T06:19:53
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -156,7 -159,7 +156,7 @@@ F src/os_common.h a8f95b81eca8a1ab8593d
  F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
  F src/os_unix.c ae173c9f6afaa58b2833a1c95c6cd32021755c42
  F src/os_win.c dfde7d33c446e89dd9a277c036f2c4cc564b3138
- F src/pager.c 133cc49da000b2685a104ed9812084c61bd7e40f
 -F src/pager.c 7f0ebd5dca02cda61a5ee2cc8d6877286592abda
++F src/pager.c 3b2527d9d65a43880a98546ea84559271bb6d970
  F src/pager.h ca1f23c0cf137ac26f8908df2427c8b308361efd
  F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
  F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@@ -823,10 -825,14 +823,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P ad3209572d0e6afe5c8b52313e334509661045e2
- R 55fd31c025a3067f63c5d2afd30242b8
- T *branch * experimental
- T *sym-experimental *
- T -sym-trunk *
 -R ad508c111bfac4ef56e6dd1a72cf9f53
 -U drh
 -Z 1cb6e747168ed02cf4bf3371c6ee48c5
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMGYTXoxKgR168RlERAgMoAKCCbW2c14E1x3NYvkGGyBe/EgKS5QCeL5Cg
 -CUKdqaE7t6fQ84lCcJEMBaQ=
 -=hOmP
 ------END PGP SIGNATURE-----
++P bede8c8a148fb9be5ffbf38df7fa733e35cc68c3 f80c3f922a114e738613955a939db46cf0847038
++R 99e9ca5d85226de77fd66a29f7003e5a
 +U dan
- Z 33e1ea27519902b3169c3c25730a3e25
++Z b12621360876a83980ead5d940279e1b
diff --cc manifest.uuid
index 08f76d7826,79c5e02bef..8726926b10
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bede8c8a148fb9be5ffbf38df7fa733e35cc68c3
 -f80c3f922a114e738613955a939db46cf0847038
++20133e9ca98f5e6c42051ed3d65e4eb71d5366a5