Documentation enhancements for sqlite3_db_status(). Evidence marks on

the SQL function call intrface.

FossilOrigin-Name: f06c7b1973d64a6a1a1db2b44df2a4eb0ece0077

diff --git a/manifest b/manifest
index 28e8133dc0690464de28b539015f11a6f849ba7f..a8ce2aadd7d383ac3ead2d8b74394b5df7a9db64 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Improved\sdocumentation\sof\sthe\ssqlite3_column_count()\sand\ssqlite3_data_count()\ninterfaces.
-D 2010-09-03T12:05:12
+C Documentation\senhancements\sfor\ssqlite3_db_status().\s\sEvidence\smarks\son\nthe\sSQL\sfunction\scall\sintrface.
+D 2010-09-03T18:50:49
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c eb57331a0f37fbfff0b24824555ac70dbc996c4d
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
-F src/sqlite.h.in 795e12e8f3c4d3fe3a4f30656c1cd13c6ea2bb0a
+F src/sqlite.h.in d867122e53a24b9a11864a7aaf2509cad62c55b2
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 4e31d3b58720d6251e08ba394641b9a63725eb8a
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -226,13 +226,13 @@ F src/update.c 227e6cd512108b84f69421fc6c7aa1b83d60d6e0
 F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
 F src/util.c 5f5f4db4e799224713582bb49124827b16aa8e54
 F src/vacuum.c 241a8386727c1497eba4955933356dfba6ff8c9f
-F src/vdbe.c 8a9f0c556f4ca2d43d5be55095140c68bc4120fe
+F src/vdbe.c 1373d40f5985577a30350bfa78ebd8e1d905ee89
 F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 F src/vdbeInt.h a247bd5448039e83394bf4179975b2ae0092874c
 F src/vdbeapi.c bec07756e1b3ec5cd054ce8d32a80787763fd07e
 F src/vdbeaux.c de0b06b11a25293e820a49159eca9f1c51a64716
 F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
-F src/vdbemem.c e5673f81a2381b35c60e73ef0a8502be2ab1041e
+F src/vdbemem.c 14439aa709d7e2e6cdb1407502ab06d551a9e384
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c 0e8e0cb30dffb078367e843e84e37ef99236c7e4
 F src/wal.c 7081f148cb52b0cf2280e6384196402dc58130a3
@@ -856,14 +856,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 189cba0072dd0b90e064f889457921aeaeefda01
-R d926ab15c40b79350a15d770aeb017e1
+P 0593373d4bf4f3451b41810513fd12cd8ebd0395
+R 32cd5b7a1b387673472bd5f9ae3eecc2
 U drh
-Z 6f7c1425246e66e3c6038da9d7023f84
+Z 08ba64448263f8fb86ddcfbd2162f09d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMgOR7oxKgR168RlERAoi0AJ4zhpKV4wAS/KyC1fUb0bKCS1oUPACgh6kd
-rp6N9Os8gQvjyq3jh8IItPU=
-=zXNW
+iD8DBQFMgUOMoxKgR168RlERAk7zAKCKyhwR1lNBXcJvJNOoNtnJk7FfEQCfdcYb
+YWj0MhV07vpCPxDnCO5bB1M=
+=1z53
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 48e9a1a167f5f7e5d68d691cc5e8546e6257faed..76f1fc3b3bc342a7961c8d5f6465d32be25374d6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0593373d4bf4f3451b41810513fd12cd8ebd0395
\ No newline at end of file
+f06c7b1973d64a6a1a1db2b44df2a4eb0ece0077
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index be50df55c89f6042a9da55627b7dcfac16f3a684..6edb8348cc45d4b3167cacd7d2802f8b515c0e53 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1415,8 +1415,14 @@ struct sqlite3_mem_methods {
 ** or equal to the product of the second and third arguments.  The buffer
 ** must be aligned to an 8-byte boundary.  ^If the second argument to
 ** SQLITE_DBCONFIG_LOOKASIDE is not a multiple of 8, it is internally
-** rounded down to the next smaller
-** multiple of 8.  See also: [SQLITE_CONFIG_LOOKASIDE]</dd>
+** rounded down to the next smaller multiple of 8.  ^(The lookaside memory
+** configuration for a database connection can only be changed when that
+** connection is not currently using lookaside memory, or in other words
+** when the "current value" returned by
+** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero.
+** Any attempt to change the lookaside memory configuration when lookaside
+** memory is in use leaves the configuration unchanged and returns 
+** [SQLITE_BUSY].)^</dd>
 **
 ** </dl>
 */
@@ -5141,7 +5147,7 @@ int sqlite3_test_control(int op, ...);
 ** ^(Other parameters record only the highwater mark and not the current
 ** value.  For these latter parameters nothing is written into *pCurrent.)^
 **
-** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
+** ^The sqlite3_status() routine returns SQLITE_OK on success and a
 ** non-zero [error code] on failure.
 **
 ** This routine is threadsafe but is not atomic.  This routine can be
@@ -5263,6 +5269,9 @@ int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag);
 ** the resetFlg is true, then the highest instantaneous value is
 ** reset back down to the current value.
 **
+** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
+** non-zero [error code] on failure.
+**
 ** See also: [sqlite3_status()] and [sqlite3_stmt_status()].
 */
 int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);

diff --git a/src/vdbe.c b/src/vdbe.c
index 6c7c10550e9dc22b8f44450e055436f3d9d397bd..a4160209840767befe1ab2fc38c95bbe2c14c2eb 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1383,7 +1383,7 @@ case OP_Function: {
     assert( pOp[-1].opcode==OP_CollSeq );
     ctx.pColl = pOp[-1].p4.pColl;
   }
-  (*ctx.pFunc->xFunc)(&ctx, n, apVal);
+  (*ctx.pFunc->xFunc)(&ctx, n, apVal); /* IMP: R-24505-23230 */
   if( db->mallocFailed ){
     /* Even though a malloc() has failed, the implementation of the
     ** user function may have called an sqlite3_result_XXX() function
@@ -5121,7 +5121,7 @@ case OP_AggStep: {
     assert( pOp[-1].opcode==OP_CollSeq );
     ctx.pColl = pOp[-1].p4.pColl;
   }
-  (ctx.pFunc->xStep)(&ctx, n, apVal);
+  (ctx.pFunc->xStep)(&ctx, n, apVal); /* IMP: R-24505-23230 */
   if( ctx.isError ){
     sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&ctx.s));
     rc = ctx.isError;

diff --git a/src/vdbemem.c b/src/vdbemem.c
index e376a65627f371924fbc2185461511cdf94f2a04..7171d7a0fd6be75bf36cd0c1ab6caf1af2aca194 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -252,7 +252,7 @@ int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){
     ctx.s.db = pMem->db;
     ctx.pMem = pMem;
     ctx.pFunc = pFunc;
-    pFunc->xFinalize(&ctx);
+    pFunc->xFinalize(&ctx); /* IMP: R-24505-23230 */
     assert( 0==(pMem->flags&MEM_Dyn) && !pMem->xDel );
     sqlite3DbFree(pMem->db, pMem->zMalloc);
     memcpy(pMem, &ctx.s, sizeof(ctx.s));