From: drh <drh@noemail.net>
Date: Mon, 14 Mar 2011 13:54:01 +0000 (+0000)
Subject: Merge the unix-excl VFS into the trunk.  This merge also adds the -vfs
X-Git-Tag: version-3.7.6~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d8abc84fad214ad8c272f2d5cffdb261c6c784b;p=thirdparty%2Fsqlite.git

Merge the unix-excl VFS into the trunk.  This merge also adds the -vfs
option to the command-line shell.

FossilOrigin-Name: 3934b004e93852c89b937ec20431de96a2e99440
---

0d8abc84fad214ad8c272f2d5cffdb261c6c784b
diff --cc manifest
index f956375794,053cef99a8..ac898a1f5c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C More\stests\sfor\sSQLITE_OMIT_UNIQUE_ENFORCEMENT\sand\sminor\schange\sto\simplementation.
- D 2011-03-12T04:58:55.547
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C In\sthe\s"unix-excl"\sVFS,\suse\sthe\sheap\sfor\sshared\smemory,\ssince\sonly\sa\ssingle\nprocess\sis\sable\sto\sread\sor\swrite\sthe\sdatabase.
 -D 2011-03-12T18:10:44.973
++C Merge\sthe\sunix-excl\sVFS\sinto\sthe\strunk.\s\sThis\smerge\salso\sadds\sthe\s-vfs\noption\sto\sthe\scommand-line\sshell.
++D 2011-03-14T13:54:01.926
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -913,7 -916,14 +916,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f957f23a8a392bb1720720960bda2c7b24de9663
- R 9809ca6e3f2473669b6771844893033b
- U shaneh
- Z 165de3d9f760ec4796ef397e07022985
 -P 00051c3296e11211b2bb5ae28f016b17dca857d7
++P b86999436ec2414c990ba720441fe316f647eef6 a05a6d40875df674f9c2b46e33128c6878d4edaa
+ R ae21c3eefa2912bdd40576825c99670e
+ U drh
 -Z 0353c9261ee94db4155a765014c19a0b
++Z ba80be8ddf09d06ab5258c5662ce63ed
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFNe7cnoxKgR168RlERAsDBAJ486IVhWF+3w87MQdsa9IV6+Kk3UQCfVQ5D
 -gOLo9IyLtbi3pQ3LQfZd9Y8=
 -=wzQK
++iD8DBQFNfh39oxKgR168RlERAmUtAJ9euZA2mXv2u5a2MP0I1/796quLkACfTDGF
++KRyVKh4JS29RnQdWZdfQ0tU=
++=K1xX
+ -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 1dab3e6dc1,178e5215aa..f958506833
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b86999436ec2414c990ba720441fe316f647eef6
 -a05a6d40875df674f9c2b46e33128c6878d4edaa
++3934b004e93852c89b937ec20431de96a2e99440