From: drh <drh@noemail.net>
Date: Fri, 19 Nov 2010 18:36:44 +0000 (+0000)
Subject: Merge in the superlock demonstration changes.
X-Git-Tag: version-3.7.4~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=204eaecda4a9a8f21859f1bf6dc937c2e38c525f;p=thirdparty%2Fsqlite.git

Merge in the superlock demonstration changes.

FossilOrigin-Name: 570e79a8eb3bb2d2a15c46c55fbf52c9dd3e3ae8
---

204eaecda4a9a8f21859f1bf6dc937c2e38c525f
diff --cc manifest
index 819394757e,be612c0ef8..c90d94de6f
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,8 @@@
 -C Add\sfile\stest_superlock.c\swith\sexample\scode\sfor\sobtaining\san\sexclusive\slock\son\seither\srollback\sor\swal\smode\sdatabases.
 -D 2010-11-19T18:20:10
 +-----BEGIN PGP SIGNED MESSAGE-----
 +Hash: SHA1
 +
- C Add\sthe\scheckpoint_fullfsync\spragma\swhich\senables\sF_FULLFSYNC\son\scheckpoint\noperations\sonly,\snot\sduring\sordinary\scommit\sfsyncs.
- D 2010-11-19T18:23:35
++C Merge\sin\sthe\ssuperlock\sdemonstration\schanges.
++D 2010-11-19T18:36:45
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -890,14 -889,7 +892,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 0a95589f2166f9ce420e647b73e8c797fe8f4833
- R 9ff48f9c3632ebb5c161a79114253731
 -P 4425b0645d0afebe3172201012d501c6992daa38
 -R 97173199d99068c3ab4ca954bf3aab8d
 -U dan
 -Z d5525c4f8f3bbdee961ec9309f0a6abe
++P a069867301de3ca2e1753bd4d2e426d27365be4c 1a3e7417a2184188fe21c3284e58720da9ca11cf
++R 612a5c6e6ceeba977718ef175cdd20b9
 +U drh
- Z a789fd2eb497f6a2ee7fc869b62ceca0
++Z f6076b0dc8e47c984cebf6ec68cb33ea
 +-----BEGIN PGP SIGNATURE-----
 +Version: GnuPG v1.4.6 (GNU/Linux)
 +
- iD8DBQFM5sCqoxKgR168RlERApS2AJ4+ntN9Z03wXj7RBuqf9nns23d2XwCcCMoX
- qdHuj9+tKtaYqLIB5TN29vE=
- =5kJQ
++iD8DBQFM5sO/oxKgR168RlERAjMvAJ46ffI5I7vl/OKgwTBinI+EBDsO5QCeLCGK
++6NmdlpkMD1RVx2Ohr0Mr5i0=
++=Nkm+
 +-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 54fd7f114d,cfc2ddc02c..f40be04733
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a069867301de3ca2e1753bd4d2e426d27365be4c
 -1a3e7417a2184188fe21c3284e58720da9ca11cf
++570e79a8eb3bb2d2a15c46c55fbf52c9dd3e3ae8