diff --git a/manifest b/manifest index 43c8b79b9d..ee1a10bfbb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\s-DSQLITE_OMIT_ATTACH=1\soption\snow\somits\sboth\sthe\sATTACH\sand\sVACUUM\r\ncommands.\sTicket\s#2268.\r\n\sThe\sregression\stest\ssuite\sdepends\son\sboth\sof\sthese\scommands\r\nand\swill\snot\srun\sif\scompiled\swith\sthis\soption.\s(CVS\s3727) -D 2007-03-27T14:44:51 +C Updates\sto\sthe\sVACUUM\sdocumentation.\s\sTicket\s#2257.\s(CVS\s3728) +D 2007-03-27T15:00:31 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -420,7 +420,7 @@ F www/fullscanb.gif f7c94cb227f060511f8909e10f570157263e9a25 F www/index-ex1-x-b.gif f9b1d85c3fa2435cf38b15970c7e3aa1edae23a3 F www/index.tcl 688cf1280232f4964d8d07fda65e166a4b2e16cc F www/indirect1b1.gif adfca361d2df59e34f9c5cac52a670c2bfc303a1 -F www/lang.tcl d449e4dc2518e334baf73fdececeafff041510b5 +F www/lang.tcl dc4dedf00d2d6c46a17a962f850fc82086accb5c F www/lockingv3.tcl e52345bd20323bef6146bfce18ae0829b2b7c87d F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c F www/nulls.tcl ec35193f92485b87b90a994a01d0171b58823fcf @@ -442,7 +442,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P a70ea7202d8ffb0321ff8f2e5036731bb1742eb8 -R 8e21b5a1896b3369f1a4fc1488f3d566 +P cbebfb89603044e48b3a87b79d1eefbbc5b4c8a5 +R 33506ae108a3d63410cc88f37a0bf6d6 U drh -Z d85839b7a4f0c45571bb293ebd535ea5 +Z f8417d4b89ac9d4701324dc273caa2e7 diff --git a/manifest.uuid b/manifest.uuid index 850be741c5..0bafd3b3d8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cbebfb89603044e48b3a87b79d1eefbbc5b4c8a5 \ No newline at end of file +c61c97c978dab7535c94033631f5ad2355c55057 \ No newline at end of file diff --git a/www/lang.tcl b/www/lang.tcl index ca0e91e1c5..2ea5f94da2 100644 --- a/www/lang.tcl +++ b/www/lang.tcl @@ -1,7 +1,7 @@ # # Run this Tcl script to generate the lang-*.html files. # -set rcsid {$Id: lang.tcl,v 1.126 2007/03/17 18:22:58 drh Exp $} +set rcsid {$Id: lang.tcl,v 1.127 2007/03/27 15:00:31 drh Exp $} source common.tcl if {[llength $argv]>0} { @@ -1889,15 +1889,23 @@ The VACUUM command cleans the main database by copying its contents to a temporary database file and reloading the original database file from the copy. This eliminates free pages, aligns table data to be contiguous, and otherwise cleans -up the database file structure. It is not possible to perform the same -process on an attached database file.

+up the database file structure.

-

This command will fail if there is an active transaction. This -command has no effect on an in-memory database.

+

VACUUM only works on the main database. +It is not possible to VACUUM an attached database file.

+ +

The VACUUM command will fail if there is an active transaction. +The VACUUM command is a no-op for in-memory databases.

As of SQLite version 3.1, an alternative to using the VACUUM command is auto-vacuum mode, enabled using the -auto_vacuum pragma.

+auto_vacuum pragma. +When auto-vacuum is enabled for a database, large deletes cause +the size of the database file to shrink. However, auto-vacuum +also causes excess fragmentation of the database file. And auto-vacuum +does not compact partially filled pages of the database as VACUUM +does. +

} # A list of keywords. A asterisk occurs after the keyword if it is on