Updates to the sqlite3_vtab_nochange() documentation. No changes to code.

FossilOrigin-Name: 5bd99abc10b8153aadff5f815ae15fbe375f34f043c65def4be03014d2efdb50

diff --git a/manifest b/manifest
index f8f5a5b12b3d86016440ce91fda2d9fca935c485..94a83df1d8dd8ef9ad06d1559f394d78c228badb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sbranch\sthat\sis\sno\slonger\sused\sdue\sto\sthe\sfix\sto\sthe\nsqlite_sequence\sschema\sproblem,\sticket\n[d8dc2b3a58cd5dc2918a1d4acbba4676a23ada4c]
-D 2018-05-23T17:53:07.408
+C Updates\sto\sthe\ssqlite3_vtab_nochange()\sdocumentation.\s\sNo\schanges\sto\scode.
+D 2018-05-24T13:59:45.761
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -496,7 +496,7 @@ F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c a35d462ee7a3c0856ad7a9d9c8921fbf3d91d911a8f39ad9d61302eb43b24a71
 F src/shell.c.in 51c100206f4b7f86cd9affd80b764825e0edc36ca0190c442e4ca7994611bfe2
-F src/sqlite.h.in 7b3e0f3a5f86eb8c43cf4924171de993210a207f2c51ca59b03f86a0d33c59d5
+F src/sqlite.h.in ac6aec2abe10585733c1fea06622df5d73f7725c36c6cf054e89affeaccfa42b
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
 F src/sqliteInt.h 5abdade4744cf3bd567afb65bb144bb3c61f6132f86813b995a5ca79c7b584e8
@@ -1729,7 +1729,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 e199e859ace4f8381c6380175206e7a276e3f2228fadbbca9341bca8d2fc445d
-R fcb7bb3e89a5dc882c6d8d40fd26a899
+P 066742692a9e8735b814c6a145545f97a7fb10b29cead78e68e25324e79aabaa
+R 2b6c7c21a55e5d907e8d89643c483eb6
 U drh
-Z 26f7d6a5cd51317fc5937ffe2a0456c5
+Z 20be9535b952178763a98e0fa1717892

diff --git a/manifest.uuid b/manifest.uuid
index f288d229ab21952716d36d4b65231fc972ce6608..6b15cbaa980332e65af701f9152dace1c684a6f5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-066742692a9e8735b814c6a145545f97a7fb10b29cead78e68e25324e79aabaa
\ No newline at end of file
+5bd99abc10b8153aadff5f815ae15fbe375f34f043c65def4be03014d2efdb50
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index fe0f14e2923ac6c2d32a0269c5f21f3c3dba7c67..7296597ea356bf132e4c3b16a9c0fc5902e66576 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -8534,11 +8534,11 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
 ** method of a [virtual table], then it returns true if and only if the
 ** column is being fetched as part of an UPDATE operation during which the
 ** column value will not change.  Applications might use this to substitute
-** a lighter-weight value to return that the corresponding [xUpdate] method
-** understands as a "no-change" value.
+** a return value that is less expensive to compute and that the corresponding
+** [xUpdate] method understands as a "no-change" value.
 **
 ** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
-** the column is not changed by the UPDATE statement, they the xColumn
+** the column is not changed by the UPDATE statement, then the xColumn
 ** method can optionally return without setting a result, without calling
 ** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
 ** In that case, [sqlite3_value_nochange(X)] will return true for the