diff --git a/manifest b/manifest index 0efe6969cc..1e085d4f57 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sFAQ.\s\sChange\sthe\sGMT\stimezone\slabel\sto\sUTC\son\sall\sfiles.\s(CVS\s318) -D 2001-11-24T13:23:05 +C Typos\sfixed.\s(CVS\s319) +D 2001-11-24T13:36:30 F Makefile.in 352fed589f09dd94347e0bb391d047118ebd6105 F Makefile.template b6c3d3ba089e97e3a721e967f3151350f36cb42b F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0 @@ -103,7 +103,7 @@ F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816 F www/arch.fig d5f9752a4dbf242e9cfffffd3f5762b6c63b3bcf F www/arch.png 82ef36db1143828a7abc88b1e308a5f55d4336f4 F www/arch.tcl 72a0c80e9054cc7025a50928d28d9c75c02c2b8b -F www/c_interface.tcl 1b05a758844273509800b04aa38841fab8dd9891 +F www/c_interface.tcl 58922228e8fdb0f6af3561a051ee8ccec6dbfd17 F www/changes.tcl 0a54872839461f49b7300b36571d342f0ef0d4fb F www/crosscompile.tcl 3622ebbe518927a3854a12de51344673eb2dd060 F www/download.tcl 1ea61f9d89a2a5a9b2cee36b0d5cf97321bdefe0 @@ -117,7 +117,7 @@ F www/speed.tcl 83457b2bf6bb430900bd48ca3dd98264d9a916a5 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279 F www/tclsqlite.tcl 880ef67cb4f2797b95bf1368fc4e0d8ca0fda956 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 974d42839b6ced9c9b9ea14abec0c4723388a991 -R 510051e75409b6b257f01060b1675252 +P f1a5808288e4204aee03531de0b9e6646062bd94 +R 4de7db51acb6aa815308596ae350a438 U drh -Z 99119da7cfe58575444c98fda1901651 +Z 572a5ddf1573f772e8b3d29ccfb91ae8 diff --git a/manifest.uuid b/manifest.uuid index 0f0664e41c..5aeeefb0ed 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f1a5808288e4204aee03531de0b9e6646062bd94 \ No newline at end of file +e86a68c5ace984da09d3ce44dae5d501ec0d0eec \ No newline at end of file diff --git a/www/c_interface.tcl b/www/c_interface.tcl index 7ca43a449d..8644e6eb15 100644 --- a/www/c_interface.tcl +++ b/www/c_interface.tcl @@ -1,7 +1,7 @@ # # Run this Tcl script to generate the sqlite.html file. # -set rcsid {$Id: c_interface.tcl,v 1.20 2001/11/24 13:23:05 drh Exp $} +set rcsid {$Id: c_interface.tcl,v 1.21 2001/11/24 13:36:30 drh Exp $} puts { @@ -124,7 +124,7 @@ int Callback(void *pArg, int argc, char **argv, char **columnNames){

The first argument to the callback is just a copy of the fourth argument to sqlite_exec() This parameter can be used to pass arbitrary information through to the callback function from client code. -The second argument is the number columns in the query result. +The second argument is the number of columns in the query result. The third argument is an array of pointers to strings where each string is a single column of the result for that record. Note that the callback function reports a NULL value in the database as a NULL pointer, @@ -279,9 +279,9 @@ schema. This is the return code for such cases. Retrying the command usually will clear the problem.

SQLITE_TOOBIG
-

SQLite cannot store more than about 64K of data in a single row -of a single table. If you attempt to store more than 64K in a single -row, this is the return code you get. +

SQLite will not store more than about 1 megabyte of data in a single +row of a single table. If you attempt to store more than 1 megabyte +in a single row, this is the return code you get.

SQLITE_CONSTRAINT

This constant is returned if the SQL statement would have violated @@ -508,14 +508,14 @@ be changed at run-time. This is a compile-time option only. The sqlite_encoding character string just tells you how the library was compiled.

-

Changing the libraries response to locked files

+

Changing the library's response to locked files

The sqlite_busy_handler() procedure can be used to register a busy callback with an open SQLite database. The busy callback will -be invoked whenever SQLite tries to open a file that is locked. +be invoked whenever SQLite tries to access a database that is locked. The callback will typically do some other useful work, or perhaps sleep, in order to give the lock a chance to clear. If the callback returns -non-zero, then SQLite tries again to open the database and the cycle +non-zero, then SQLite tries again to access the database and the cycle repeats. If the callback returns zero, then SQLite aborts the current operation and returns SQLITE_BUSY.

@@ -526,8 +526,8 @@ the first argument to the busy callback. When SQLite invokes the busy callback, it sends it three arguments: the generic pointer that was passed in as the third argument to sqlite_busy_handler, the name of the database table or index that the library is trying -to open, and the number of times that the library has attempted to -open the database table or index.

+to access, and the number of times that the library has attempted to +access the database table or index.

For the common case where we want the busy callback to sleep, the SQLite library provides a convenience routine sqlite_busy_timeout().