Reserve a range of bits in the SQLITE_OPEN_xxxx bit vector for future

expansion.

FossilOrigin-Name: 9b9046546db5b060e37e7ba01c23bb7e9528d861

diff --git a/manifest b/manifest
index 7c075f63a31aa6da3e8ad12ccca5561a68fe25b7..0cfe7bd2984314d34d7ca89e606b59ad43dddaa7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sa\stypo\sin\sthe\srobust_flock()\smacro\sfor\ssystems\swithout\sEINTR.
-D 2011-02-23T14:00:12.626
+C Reserve\sa\srange\sof\sbits\sin\sthe\sSQLITE_OPEN_xxxx\sbit\svector\sfor\sfuture\nexpansion.
+D 2011-02-23T22:39:23.202
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -145,7 +145,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
-F src/main.c 3be0ccf84c92da06aae7f56cf39a9ee7bfddf799
+F src/main.c 93d0d967d6898fc0408ece248342342e312aa753
 F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@ -180,7 +180,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
 F src/shell.c 649c51979812f77f97507024a4cea480c6862b8b
-F src/sqlite.h.in 388fca88d54577f671dc98bd805ff16085eabac1
+F src/sqlite.h.in ccb23cc9378874c7c72682b739f311474a80848d
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h 4290fff17fabc6e07fc4338233df0e39e6350ca1
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -912,14 +912,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b9d29ea385bafcf87c7dd07822ce9ec3d3892bd1
-R 8c830d401ce0cb1348099c3c471b15af
+P af9ba2a6d2c37915e799eec52bb827de46afd34d
+R 0ae1c418d27eca862f3e3752ba232d01
 U drh
-Z 9ca7493e74d103b42f51528f83eaa247
+Z 39b3a0a85d9d11269094838f6fc13889
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNZRLvoxKgR168RlERAoCzAJ4krAbov2L1xTZwjmz9V4sri0AYgwCghfOe
-/ATOOto8D0XuUEn4VIMmk/w=
-=+rra
+iD8DBQFNZYyeoxKgR168RlERAhZOAKCGpEBvzInJPpys0/DCiCfVjcNwuwCfe0KD
+n8lAxBaTMOc5Wvvsk3jmGCA=
+=2S+y
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index a512f02c3a50d9b49e1ea79d4ab14a50ca563836..b7ba00795b43b0e3dabf9c83c862602c0640b456 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-af9ba2a6d2c37915e799eec52bb827de46afd34d
\ No newline at end of file
+9b9046546db5b060e37e7ba01c23bb7e9528d861
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 10367e78aa4b3664199ff328b67bff3131ccb7ce..833b9812b0cc6f2b0b3365637b8ebabd83f6a7cf 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1808,7 +1808,8 @@ static int openDatabase(
   ** The SQLITE_OPEN_NOMUTEX and SQLITE_OPEN_FULLMUTEX flags were
   ** dealt with in the previous code block.  Besides these, the only
   ** valid input flags for sqlite3_open_v2() are SQLITE_OPEN_READONLY,
-  ** SQLITE_OPEN_READWRITE, and SQLITE_OPEN_CREATE.  Silently mask
+  ** SQLITE_OPEN_READWRITE, SQLITE_OPEN_CREATE, SQLITE_OPEN_SHAREDCACHE,
+  ** SQLITE_OPEN_PRIVATECACHE, and some reserved bits.  Silently mask
   ** off all other flags.
   */
   flags &=  ~( SQLITE_OPEN_DELETEONCLOSE |

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 36797e640440025475e7c17e8e79ea9e645999a7..3400c6c9169256a6f1d0ba31a453c46628def2db 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -478,6 +478,8 @@ int sqlite3_exec(
 #define SQLITE_OPEN_PRIVATECACHE     0x00040000  /* Ok for sqlite3_open_v2() */
 #define SQLITE_OPEN_WAL              0x00080000  /* VFS only */
 
+/* Reserved:                         0x00F00000 */
+
 /*
 ** CAPI3REF: Device Characteristics
 **