Documentation updates. No changes to code. (CVS 5402)

FossilOrigin-Name: 8be28aa0f259f0b86103e4f1e7da1adfecc4305c

diff --git a/manifest b/manifest
index c03bd1921b024d3f8c67e7b65753b69338cb4c70..3f378f28094502437b3615842a0ebf69eb85ab7d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\stest\sscript\s--binarylog\soption.\s(CVS\s5401)
-D 2008-07-12T15:55:55
+C Documentation\supdates.\s\sNo\schanges\sto\scode.\s(CVS\s5402)
+D 2008-07-12T20:35:08
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -142,7 +142,7 @@ F src/printf.c 8e5d410220cf8650f502caf71f0de979a3f9031e
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
 F src/select.c b909e21358f141627d1cadfdfbdb43ec08ed0a4b
 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1
-F src/sqlite.h.in a573ab3a22256fc6c28b8f27d5af446f2b712a31
+F src/sqlite.h.in d3375d424d5cd544be677e00e6bb6f5c097592ae
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
 F src/sqliteInt.h aebce6d82210334fe00e6d5fa4bb6768cf02f184
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -605,7 +605,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P dcb160249fa2d592ad09b8b0052102dc44a93511
-R 710dd56994c44964337f17483893049d
-U danielk1977
-Z 8c0bccde1c33db0df30307b242744816
+P 03e3cfc4ccab3c6441d41ade175dc041b8fa6c98
+R 11489015ad2b9249c10d6c183f036690
+U drh
+Z 8e531d1b9768d331244327bb2933b94f

diff --git a/manifest.uuid b/manifest.uuid
index 53a1facf3f7e4f0d5dd5fe1748f6f857e4264d6c..46f37bbb82f9a507d5658fa464a5c8baa6522165 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03e3cfc4ccab3c6441d41ade175dc041b8fa6c98
\ No newline at end of file
+8be28aa0f259f0b86103e4f1e7da1adfecc4305c
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index b1a77a03bb51510734887e1950da5ce2e6223be9..202759acddb54eb56b16df2f0e3fc25ea53e8d82 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.368 2008/07/11 16:15:18 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.369 2008/07/12 20:35:08 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -1049,7 +1049,12 @@ struct sqlite3_mem_methods {
 ** [SQLITE_THREADSAFE=1]) the SQLite library will itself serialize access
 ** to [database connections] and [prepared statements] so that the
 ** application is free to use the same [database connection] or the
-** same [prepared statement] in different threads at the same time.</dd>
+** same [prepared statement] in different threads at the same time.
+**
+** <p>This configuration option merely sets the default mutex 
+** behavior to serialize access to [database connections].  Individual
+** [database connections] can override this setting
+** using the [SQLITE_OPEN_NOMUTEX] flag to [sqlite3_open_v2()].</p></dd>
 **
 ** <dt>SQLITE_CONFIG_MALLOC</dt>
 ** <dd>This option takes a single argument which is a pointer to an
@@ -2282,7 +2287,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** except that it accepts two additional parameters for additional control
 ** over the new database connection.  The flags parameter can take one of
 ** the following three values, optionally combined with the 
-** SQLITE_OPEN_NOMUTEX flag:
+** [SQLITE_OPEN_NOMUTEX] flag:
 **
 ** <dl>
 ** <dt>[SQLITE_OPEN_READONLY]</dt>
@@ -2302,12 +2307,16 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **
 ** If the 3rd parameter to sqlite3_open_v2() is not one of the
 ** combinations shown above or one of the combinations shown above combined
-** with the SQLITE_OPEN_NOMUTEX flag, then the behavior is undefined.
-**
-** If the SQLITE_OPEN_NOMUTEX flag is set, then the opened database handle  
-** is not threadsafe. If two threads attempt to use the database handle or
-** any of it's statement handles simultaneously, the results will be 
-** unpredictable.
+** with the [SQLITE_OPEN_NOMUTEX] flag, then the behavior is undefined.
+**
+** If the [SQLITE_OPEN_NOMUTEX] flag is set, then mutexes on the
+** opened [database connection] are disabled and the appliation must
+** insure that access to the [database connection] and its associated
+** [prepared statements] is serialized.  The [SQLITE_OPEN_NOMUTEX] flag
+** is the default behavior is SQLite is configured using the
+** [SQLITE_CONFIG_MULTITHREAD] or [SQLITE_CONFIG_SINGLETHREAD] options
+** to [sqlite3_config()].  The [SQLITE_OPEN_NOMUTEX] flag only makes a
+** difference when SQLite is in its default [SQLITE_CONFIG_SERIALIZED] mode.
 **
 ** If the filename is ":memory:", then a private, temporary in-memory database
 ** is created for the connection.  This in-memory database will vanish when