From: drh <drh@noemail.net>
Date: Thu, 10 Feb 2011 18:56:09 +0000 (+0000)
Subject: Split the documentation for sqlite3_wal_checkpoint_v2() and its constants
X-Git-Tag: version-3.7.6~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3625008a54a495180ea9722695b584aac00750da;p=thirdparty%2Fsqlite.git

Split the documentation for sqlite3_wal_checkpoint_v2() and its constants
onto separate pages.  No changes to code.

FossilOrigin-Name: 0ef8ffd12fce47c3c89e851e5116e2777ea9f435
---

diff --git a/manifest b/manifest
index 962d259cbb..a1d45c6c98 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Prevent\sa\ssegfault\swhen\sautomatic\sindices\stry\sto\suse\sa\scolumn\swith\san\nunknown\scollating\sfunction.\s\sTicket\s[77aa3b1e6592582e38605d36].\s\sThis\ncheck-in\salso\sremoves\ssome\sstray\s\\r\scharacters\sunrelated\sto\sthe\sproblem.
-D 2011-02-10T17:46:14.555
+C Split\sthe\sdocumentation\sfor\ssqlite3_wal_checkpoint_v2()\sand\sits\sconstants\nonto\sseparate\spages.\s\sNo\schanges\sto\scode.
+D 2011-02-10T18:56:09.384
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
 F src/shell.c 83c6f0cc5a79a081c7b9ddfe4f557b47e0bad976
-F src/sqlite.h.in c0456330093737c74409e7f7d89d0f1e0dbf43b7
+F src/sqlite.h.in 388fca88d54577f671dc98bd805ff16085eabac1
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h 4290fff17fabc6e07fc4338233df0e39e6350ca1
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -909,14 +909,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 878da276ebf643b716ddd650d4d0ca3595fe5bf2
-R 7115e9b9167d54b1bd5babaa217ab874
+P f01030a0df4f94f886ab209ee8766b095da28c1e
+R 2590b9c422d45b3d68d0b1f0556faac2
 U drh
-Z a8209f45d500942f895f6428366345d2
+Z 8f35992af258613e67fb2f7479d0acfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNVCRpoxKgR168RlERAt6wAJoDNGsC+YrJposBo+/cLnxCnBAN3gCfbqz3
-zSgAQldrrpVNMc5IxEfC5AM=
-=muXT
+iD8DBQFNVDTQoxKgR168RlERAgszAJ9/65Cz9Wl3XuCrc/sDPkoI0E48AACdERjU
+2WQDB8UTlGsMf+tt4Cs6v4w=
+=jtEL
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 96301c157d..10a9ca42b4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f01030a0df4f94f886ab209ee8766b095da28c1e
\ No newline at end of file
+0ef8ffd12fce47c3c89e851e5116e2777ea9f435
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 6bdc6afc95..36797e6404 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -6247,11 +6247,12 @@ int sqlite3_wal_autocheckpoint(sqlite3 *db, int N);
 ** from SQL.  ^The [sqlite3_wal_autocheckpoint()] interface and the
 ** [wal_autocheckpoint pragma] can be used to cause this interface to be
 ** run whenever the WAL reaches a certain size threshold.
+**
+** See also: [sqlite3_wal_checkpoint_v2()]
 */
 int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);
 
 /*
-**
 ** CAPI3REF: Checkpoint a database
 **
 ** Run a checkpoint operation on WAL database zDb attached to database 
@@ -6328,6 +6329,15 @@ int sqlite3_wal_checkpoint_v2(
   int *pnLog,                     /* OUT: Size of WAL log in frames */
   int *pnCkpt                     /* OUT: Total number of frames checkpointed */
 );
+
+/*
+** CAPI3REF: Checkpoint operation parameters
+**
+** These constants can be used as the 3rd parameter to
+** [sqlite3_wal_checkpoint_v2()].  See the [sqlite3_wal_checkpoint_v2()]
+** documentation for additional information about the meaning and use of
+** each of these values.
+*/
 #define SQLITE_CHECKPOINT_PASSIVE 0
 #define SQLITE_CHECKPOINT_FULL    1
 #define SQLITE_CHECKPOINT_RESTART 2