From: drh <drh@noemail.net>
Date: Thu, 31 Jul 2008 14:47:54 +0000 (+0000)
Subject: Documentation updates. (CVS 5511)
X-Git-Tag: version-3.6.10~666
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2462e322464199d3c1551a6a7236a311f0abd701;p=thirdparty%2Fsqlite.git

Documentation updates. (CVS 5511)

FossilOrigin-Name: e7fdd813ccdefab33aedbcf7f44e13b935dd3299
---

diff --git a/manifest b/manifest
index c2c01d139e..dbd4b3e173 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updated\somittest.tcl.\s\sUpdated\sOMIT\slist.\sUpdated\sfor\sWindows.\s(CVS\s5510)
-D 2008-07-31T02:43:35
+C Documentation\supdates.\s(CVS\s5511)
+D 2008-07-31T14:47:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -144,7 +144,7 @@ F src/printf.c 2e984b2507291a7e16d89dc9bb60582904f6247d
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
 F src/select.c ef18af5624fc3189014e6b617a36562394740f91
 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1
-F src/sqlite.h.in c1afc4a05dde8c6b9c8ea783b0b5a624892e299b
+F src/sqlite.h.in 1980ef5f4f36ae986f3bf1d54ee322c967b69923
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
 F src/sqliteInt.h a4d6bcf383b1ff207f175f7e274a83d1283c73d7
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 524a4075ddaecb07469da717e8afebc91240616e
-R 3d726d916a7b113af0235b1956f76028
-U shane
-Z 3303b9e791476ab11d91cf7aaab2d13d
+P f94239933e6f93d9780178b6f9a6b14ca791716a
+R cac4b89ea15db49a51f5d5c6e563f0a7
+U drh
+Z 1c663e3103bc4c56c4b3a3ae279ff2de
diff --git a/manifest.uuid b/manifest.uuid
index d2a217c8e5..8f6e018af0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f94239933e6f93d9780178b6f9a6b14ca791716a
\ No newline at end of file
+e7fdd813ccdefab33aedbcf7f44e13b935dd3299
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 13d6fe5bce..ccc53e6303 100644
--- 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.382 2008/07/28 19:34:53 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.383 2008/07/31 14:47:55 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -975,9 +975,20 @@ int sqlite3_config(int, ...);
 ** CAPI3REF: Configure database connections  {H10180} <S20000>
 **
 ** The sqlite3_db_config() interface is used to make configuration
-** changes to a [database connection].  
+** changes to a [database connection].  The interface is similar to
+** [sqlite3_config()] except that the changes apply to a single
+** [database connection] (specified in the first argument).  The
+** sqlite3_db_config() interface can only be used immediately after
+** the database connection is created using [sqlite3_open()],
+** [sqlite3_open16()], or [sqlite3_open_v2()].  
+**
+** The second argument to sqlite3_db_config(D,V,...)  is the
+** configuration verb - an integer code that indicates what
+** aspect of the [database connection] is being configured.
+** Choices for this value are [SQLITE_CONFIG_LOOKASIDE].
+** New verbs are likely to be added in future releases of SQLite.
 */
-int sqlite3_db_config(sqlite3*, int, ...);
+int sqlite3_db_config(sqlite3*, int op, ...);
 
 /*
 ** CAPI3REF: Memory Allocation Routines {H10155} <S20120>
@@ -6086,10 +6097,33 @@ int sqlite3_test_control(int op, ...);
 ** and it is possible that another thread might change the parameter
 ** in between the times when *pCurrent and *pHighwater are written.
 **
+** See also: [sqlite3_db_status()]
+**
 ** This interface is experimental and is subject to change or
 ** removal in future releases of SQLite.
 */
 int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag);
+
+/*
+** CAPI3REF: Database Connection Status {H17201} <S60200>
+**
+** This interface is used to retrieve runtime status information 
+** about a single [database connection].  The first argument is the
+** database connection object to be interrogated.  The second argument
+** is the parameter to interrogate.  Currently, the only allowed value
+** for the second parameter is [SQLITE_DBSTATUS_LOOKASIDE_USED].
+** Additional options will likely appear in future releases of SQLite.
+**
+** The current value of the request parameter is written into *pCur
+** and the highest instantaneous value is written into *pHiwtr.  If
+** the resetFlg is true, then the highest instantaneous value is
+** reset back down to the current value.
+**
+** See also: [sqlite3_status()].
+**
+** This interface is experimental and is subject to change or
+** removal in future releases of SQLite.
+*/
 int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
 
 /*