From: drh <drh@noemail.net>
Date: Tue, 20 Mar 2018 11:58:28 +0000 (+0000)
Subject: Closer reading of the sqlite3_db_config() documentation show that it is
X-Git-Tag: version-3.23.0~47^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b3424d4ee78c031032d161f4879325c1e34e847;p=thirdparty%2Fsqlite.git

Closer reading of the sqlite3_db_config() documentation show that it is
subtly incorrect.  This check-in fixes the problem.  No code changes.

FossilOrigin-Name: 44d90e7f4bc83680e8fbbf1a0423c6f5cc2cc2aed118b7af1c4c3d9e09b05dd7
---

diff --git a/manifest b/manifest
index 574b308b2a..c7f460229b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sminor\sformatting\sissue\son\sthe\ssqlite3_db_config()\sdocumentation.\nNo\schanges\sto\scode.
-D 2018-03-20T11:51:36.092
+C Closer\sreading\sof\sthe\ssqlite3_db_config()\sdocumentation\sshow\sthat\sit\sis\nsubtly\sincorrect.\s\sThis\scheck-in\sfixes\sthe\sproblem.\s\sNo\scode\schanges.
+D 2018-03-20T11:58:28.771
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -491,7 +491,7 @@ F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 0502980145d371c2e9ab31bdaef62c65355f4f815059324f8d764359cc1dcc21
 F src/shell.c.in 52b1b3f52159144391d598f43ef7ce13f58f35fcc18ae04df68e879695a1747f
-F src/sqlite.h.in 9366a3fc56d96fc405492296a2245796a8899b4882e5c911f39b21c45d3742e6
+F src/sqlite.h.in 19762b57baa1ade67531f254de94374428fb9c82452ef305017847945f9c2911
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
 F src/sqliteInt.h 5c07bbc55d9eb3389a10536bd008e2d6f20f586871972610431d943595b40ca4
@@ -1712,7 +1712,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P eddc35f3057e59fdc25a6911abfaa53a10cc43d8030925b65737b2f51f907421
-R b459fde9f9fc6bed9a55f4e4cc80ea3a
+P 8a439a6dda390d7486feb837f87a83e16abd283c882e81e637bd1235d2684379
+R 4a8d2973e82f63e78c33aea4d4a98f42
 U drh
-Z 424309a260ffc365c6d17df4cbe208e8
+Z 941c6c30265726a1112c988a7aaa89dd
diff --git a/manifest.uuid b/manifest.uuid
index 57195b8326..75a8262559 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a439a6dda390d7486feb837f87a83e16abd283c882e81e637bd1235d2684379
\ No newline at end of file
+44d90e7f4bc83680e8fbbf1a0423c6f5cc2cc2aed118b7af1c4c3d9e09b05dd7
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index cc5244f002..e7de61bce0 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2054,8 +2054,9 @@ struct sqlite3_mem_methods {
 ** connections at all to the database. If so, it performs a checkpoint 
 ** operation before closing the connection. This option may be used to
 ** override this behaviour. The first parameter passed to this operation
-** is an integer - non-zero to disable checkpoints-on-close, or zero (the
-** default) to enable them. The second parameter is a pointer to an integer
+** is an integer - positive to disable checkpoints-on-close, or zero (the
+** default) to enable them, and negative to leave the setting unchanged.
+** The second parameter is a pointer to an integer
 ** into which is written 0 or 1 to indicate whether checkpoints-on-close
 ** have been disabled - 0 if they are not disabled, 1 if they are.
 ** </dd>
@@ -2069,6 +2070,11 @@ struct sqlite3_mem_methods {
 ** slower.  But the QPSG has the advantage of more predictable behavior.  With
 ** the QPSG active, SQLite will always use the same query plan in the field as
 ** was used during testing in the lab.
+** The first argument to this setting is an integer which is 0 to disable 
+** the QPSG, positive to enable QPSG, or negative to leave the setting
+** unchanged. The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether the QPSG is disabled or enabled
+** following this call.
 ** </dd>
 **
 ** <dt>SQLITE_DBCONFIG_TRIGGER_EQP</dt>
@@ -2076,7 +2082,8 @@ struct sqlite3_mem_methods {
 ** include output for any operations performed by trigger programs. This
 ** option is used to set or clear (the default) a flag that governs this
 ** behavior. The first parameter passed to this operation is an integer -
-** non-zero to enable output for trigger programs, or zero to disable it.
+** positive to enable output for trigger programs, or zero to disable it,
+** or negative to leave the setting unchanged.
 ** The second parameter is a pointer to an integer into which is written 
 ** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if 
 ** it is not disabled, 1 if it is.