From: dan <dan@noemail.net>
Date: Sat, 15 May 2010 10:24:46 +0000 (+0000)
Subject: Add a note to the documentation of sqlite3_wal_hook() to say not to return SQLITE_ROW... 
X-Git-Tag: version-3.7.2~370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=982d4c0c72fd90c202fb39909204f5563d4f83ce;p=thirdparty%2Fsqlite.git

Add a note to the documentation of sqlite3_wal_hook() to say not to return SQLITE_ROW or SQLITE_DONE. Or any other value that is not a valid SQLite error code.

FossilOrigin-Name: 2f0b6cbf7b4fa31242ff4f6163226c22ae4f8c9b
---

diff --git a/manifest b/manifest
index fa299b2027..0d85543999 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Silently\signore\serrors\strying\sto\sset\sthe\sdefault\sjournal_mode\swhile\sdoing\nan\sATTACH.
-D 2010-05-15T01:09:39
+C Add\sa\snote\sto\sthe\sdocumentation\sof\ssqlite3_wal_hook()\sto\ssay\snot\sto\sreturn\sSQLITE_ROW\sor\sSQLITE_DONE.\sOr\sany\sother\svalue\sthat\sis\snot\sa\svalid\sSQLite\serror\scode.
+D 2010-05-15T10:24:46
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -171,7 +168,7 @@ F src/resolve.c ac5f1a713cd1ae77f08b83cc69581e11bf5ae6f9
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b
 F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
-F src/sqlite.h.in a86bb87f5c9e97ed286a70d515d6c19de031f382
+F src/sqlite.h.in 14aa9773a255f1dca579218f0981806a3c1b479c
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h c1ca9bed7c963343f90edaf0ec31b8ff4b43fb01
 F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
@@ -816,14 +813,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9ef99d97d25aae81df971d40ad10c544b8f30053
-R 961b4b6943a386936b4f6cb172249d24
-U drh
-Z afe994fde406afebdf78e209bed2468a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFL7fRWoxKgR168RlERAoyCAJ9K9uVNPZcIs/A8LqoY6XKLaZYBWgCfZ1BC
-jNrGvYwg0uJo5GwqeN+58+U=
-=QeSc
------END PGP SIGNATURE-----
+P b9af4ad2efadfb2fb9e338dc081a6231f1536700
+R 284d8e3bf78e8e6d0ac2492e7d80e5c4
+U dan
+Z 5bf74290745d630f4082cd4abfc62978
diff --git a/manifest.uuid b/manifest.uuid
index 1d31c5eaed..137260e688 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9af4ad2efadfb2fb9e338dc081a6231f1536700
\ No newline at end of file
+2f0b6cbf7b4fa31242ff4f6163226c22ae4f8c9b
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index af36382edc..66ab68b30d 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5784,7 +5784,10 @@ void sqlite3_log(int iErrCode, const char *zFormat, ...);
 ** The callback function should normally return SQLITE_OK.  ^If an error
 ** code is returned, that error will propagate back up through the
 ** SQLite code base to cause the statement that provoked the callback
-** to report an error, though the commit will have still occurred.
+** to report an error, though the commit will have still occurred. If the
+** callback returns SQLITE_ROW or SQLITE_DONE, or if it returns a value
+** that does not correspond to any valid SQLite error code, the results
+** are undefined.
 **
 ** A single database handle may have at most a single write-ahead log callback 
 ** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any