Update sqlite3_open*() documentation on shared cache/filename matching relationship...

FossilOrigin-Name: 235e384eca65d5007e8e0c440904eb254f9b976a

diff --git a/manifest b/manifest
index 21585b65c8b6abf4db8be90c0b0b03b579d1b41a..b6740d996bed0dd1c70a232075ac2988d75f5648 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sVACUUM\scommand\sso\sthat\sit\sdoes\snot\smodify\sthe\schanges\scounts\nreported\sby\ssqlite3_changes()\sor\ssqlite3_total_changes().\s\sUpdate\sdocumentation\non\ssqlite3_changes()\sand\ssqlite3_total_changes()\sto\sstate\sthat\n"DELETE\sFROM\stable"\srecords\sa\schange\scount\sof\szero.\s(CVS\s5151)
-D 2008-05-21T13:44:14
+C Update\ssqlite3_open*()\sdocumentation\son\sshared\scache/filename\smatching\srelationship.\s\sTicket\s#3132.\s(CVS\s5152)
+D 2008-05-21T15:01:21
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -130,7 +130,7 @@ F src/printf.c f2d4f6c5b0ec24b643e85fe60258adad8b1f6acc
 F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a
 F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8
 F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec
-F src/sqlite.h.in 96b68b840683341d0a312bb7211570335842d271
+F src/sqlite.h.in 7bbf0c2359fd1de3e337a5ed614b17ddac1b18da
 F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
 F src/sqliteInt.h 70a2b0bf856bbdb86b10d994ea863f6591ab7144
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -636,7 +636,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P de8e67182d8f9d1f0b215da93a396b9467604a50
-R 5e43d7445a41e487e91a32f3f92251f9
-U drh
-Z f00defe86398257c2a438618ab5ea19b
+P f5d61d7d982b58accaf33df4362ce4a5eb79307e
+R 42e618db2ae86e2160c59be2f9d5da71
+U shane
+Z 5788821c85d4f89b016a3bb69ebecefe

diff --git a/manifest.uuid b/manifest.uuid
index c59f946d2d46bf4c49b4467cb071f7db0d7d0dd0..3ab5df43386a4b5725a66afea030e02985add45b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5d61d7d982b58accaf33df4362ce4a5eb79307e
\ No newline at end of file
+235e384eca65d5007e8e0c440904eb254f9b976a
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index b584d8bf19eed0d4c9e151a5d97efbd7e40f5124..7a1666b03d8a8ab03e2d0957ca4a13188736116c 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.316 2008/05/21 13:44:14 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.317 2008/05/21 15:01:21 shane Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -308,7 +308,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
 **          invoked once for each row of result.
 **
 ** {F12110} If the callback returns a non-zero value then [sqlite3_exec()]
-**          shall aborted the SQL statement it is currently evaluating,
+**          shall abort the SQL statement it is currently evaluating,
 **          skip all subsequent SQL statements, and return [SQLITE_ABORT].
 **
 ** {F12113} The [sqlite3_exec()] routine shall pass its 4th parameter through
@@ -2096,6 +2096,14 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **          [sqlite3_open_v2(F,D,G,V)] will use the
 **          [sqlite3_vfs] object identified by the V parameter, or
 **          the default [sqlite3_vfs] object is V is a NULL pointer.
+**
+** {F12723} Two [database connection | database connections] will share a common cache
+**          if both were opened with the same VFS
+**          while [sqlite3_enable_shared_cache | shared cache mode was enabled] and
+**          if both filenames compare equal using memcmp()
+**          after having been processed by the [sqlite3_vfs | xFullPathname] method of
+**          the VFS.
+**
 */
 int sqlite3_open(
   const char *filename,   /* Database filename (UTF-8) */