From: adam <adam@noemail.net>
Date: Tue, 26 Jan 2010 01:14:33 +0000 (+0000)
Subject: Updated open mask to include SQLITE_OPEN_AUTOPROXY
X-Git-Tag: mountain-lion~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd8e3b33dc46e4c49e933789824784660390222;p=thirdparty%2Fsqlite.git

Updated open mask to include SQLITE_OPEN_AUTOPROXY

FossilOrigin-Name: 7c3bede3f21812aa78105c6685654f12f0460eea
---

diff --git a/manifest b/manifest
index f8e52c8bfb..9a5b8d1fcd 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Align\sthe\sos_unix.c\ssource\sfile\swith\sthe\sversion\sfound\son\strunk.
-D 2010-01-20T13:20:23
+C Updated\sopen\smask\sto\sinclude\sSQLITE_OPEN_AUTOPROXY
+D 2010-01-26T01:14:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +147,7 @@ F src/mutex_os2.c 20477db50cf3817c2f1cd3eb61e5c177e50231db
 F src/mutex_unix.c 04a25238abce7e3d06b358dcf706e26624270809
 F src/mutex_w32.c 9ec75bcef0ca722821be7968c320fd725abfb984
 F src/notify.c f799bbda67ab6619b36b0a24153b49518874a203
-F src/os.c 4500ff276e277730776fe9b6c6c5930383ec4000
+F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
@@ -792,14 +789,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 96499b1dd69a0954e30e4b5b4f2272ab306afcdb 571594bfbe89d9949bdb8b07712e96d0a3467c6e
-R a941e3b4351f348c4273e4ffefa122f7
-U drh
-Z b7bdf37e77a6e7947e42f3f327673189
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFLVwMaoxKgR168RlERAqE/AJ9fO7S6dcVrGQzP7yNPtPGJbQk/0wCcCvNu
-2NymGUEKKtQgKWSphPhh2gY=
-=cIK7
------END PGP SIGNATURE-----
+P fa0f6c140e8ff9a5eed1d8a339fb6d55ecdca688
+R 8b1d7485bc4c881d19eaef86e225a80d
+U adam
+Z 5870ed5d195e3ef8dfcac0b726fcc0b8
diff --git a/manifest.uuid b/manifest.uuid
index 9a597c7fa4..7f028299cf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fa0f6c140e8ff9a5eed1d8a339fb6d55ecdca688
\ No newline at end of file
+7c3bede3f21812aa78105c6685654f12f0460eea
\ No newline at end of file
diff --git a/src/os.c b/src/os.c
index 598383d5b9..f3600cb0e2 100644
--- a/src/os.c
+++ b/src/os.c
@@ -112,11 +112,11 @@ int sqlite3OsOpen(
 ){
   int rc;
   DO_OS_MALLOC_TEST(0);
-  /* 0x7f1f is a mask of SQLITE_OPEN_ flags that are valid to be passed
+  /* 0x7f3f is a mask of SQLITE_OPEN_ flags that are valid to be passed
   ** down into the VFS layer.  Some SQLITE_OPEN_ flags (for example,
   ** SQLITE_OPEN_FULLMUTEX or SQLITE_OPEN_SHAREDCACHE) are blocked before
   ** reaching the VFS. */
-  rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x7f1f, pFlagsOut);
+  rc = pVfs->xOpen(pVfs, zPath, pFile, flags & 0x7f3f, pFlagsOut);
   assert( rc==SQLITE_OK || pFile->pMethods==0 );
   return rc;
 }