From: drh <drh@noemail.net>
Date: Fri, 5 Nov 2010 00:01:39 +0000 (+0000)
Subject: Merge the multiplexer VFS demo into the trunk.
X-Git-Tag: version-3.7.4~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bb7ae268e4c33a236e60347f062b8164ca803a4;p=thirdparty%2Fsqlite.git

Merge the multiplexer VFS demo into the trunk.

FossilOrigin-Name: 1635d927cd434052303e0e75f58a08a1e2fefd86
---

9bb7ae268e4c33a236e60347f062b8164ca803a4
diff --cc manifest
index 62a4db2d42,a054b50e84..1085b691bc
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,10 +1,10 @@@
- C Include\sthe\sprint_pager_state()\sfunction\sonly\sif\sSQLITE_DEBUG\sis\sdefined.
- D 2010-11-04T04:47:43
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Fix\sthe\sMakefile.in\sso\sthat\sit\sworks\swith\sthe\smultiplexer\sVFS.
 -D 2010-11-05T00:00:42
++C Merge\sthe\smultiplexer\sVFS\sdemo\sinto\sthe\strunk.
++D 2010-11-05T00:01:40
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2c8cefd962eca0147132c7cf9eaa4bb24c656f3f
+ F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -883,7 -888,14 +888,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 31989b18f53d97eddfb39660ef04fbf9463583e0
- R 77870c9f645f63161c757949a10d4b5d
- U dan
- Z 5b77deb3710cb464f4b30c8cda028e60
 -P 57fe35357dba7ebb382486b916004004b35f8c55
++P 3104f17e5dd0be4f176905dde6df3be50ba28702 54e2efb6679433e48106247ed6ea0d4c029438b8
+ R fca1c48d8560f11cfa1d07bdc32e8cdd
+ U drh
 -Z ab9bd238c44353ca360ff24c77c3e9fd
++Z 9a0ee5ff975b9a22db7a6e4c3241a331
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFM00kvoxKgR168RlERAsLGAJ46/bkp8EV92Er1LghqUZG9wo+4YgCgjGl9
 -RBoxPM5PzTRFK2P31tRourI=
 -=LWOS
++iD8DBQFM00lnoxKgR168RlERAo2tAJsEk/+2OmtLWL5TSWwbV+4qIjsDeACaAjit
++Ngc6/LFXcBDXn+DkNaIFpQc=
++=oUO7
+ -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index b78b77bbc6,a52acb13cd..6061ce17a5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3104f17e5dd0be4f176905dde6df3be50ba28702
 -54e2efb6679433e48106247ed6ea0d4c029438b8
++1635d927cd434052303e0e75f58a08a1e2fefd86