From: drh <drh@noemail.net>
Date: Tue, 2 Aug 2016 13:26:34 +0000 (+0000)
Subject: Updates to requirements marks.  No changes to code.
X-Git-Tag: version-3.14.0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7203cde291ec15324bf0150484df81ba7b8bced;p=thirdparty%2Fsqlite.git

Updates to requirements marks.  No changes to code.

FossilOrigin-Name: b23c10ac8f65bc88a6c7d88e140217222eb4cbe5
---

diff --git a/manifest b/manifest
index 79a50d4114..dcecb8eb96 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sintroduced\sby\s[77948b5eceab92a7]\scausing\sduplicate\scalls\sto\sbe\smade\sto\sthe\sxSavepoint()\smethod\sof\svirtual\stables\sunder\ssome\scircumstances.
-D 2016-08-02T11:29:16.818
+C Updates\sto\srequirements\smarks.\s\sNo\schanges\sto\scode.
+D 2016-08-02T13:26:34.987
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@ -385,7 +385,7 @@ F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
-F src/sqlite.h.in b41cf2d1deb59db570f20e8ed7ade4716c6dc613
+F src/sqlite.h.in e011dcc3942e6ddc8dd7b894e9e6702e4269161e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
@@ -1509,7 +1509,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 7c38a79cdd42aaa45715aea330d10ca859098837
-R dce642e9ffc5d2b7ba510a82ce70adfa
-U dan
-Z 723af27ecacb58bb0a83305d88f4583f
+P e64a4173d2899acf13b73e6e28f2e164fd638a75
+R 2f7c4e993e0eb7bb61a5a37266251c67
+U drh
+Z 9edc5e5cd5ca93c7d8faa216313b72e1
diff --git a/manifest.uuid b/manifest.uuid
index 003f16e3e2..ac57330bc6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e64a4173d2899acf13b73e6e28f2e164fd638a75
\ No newline at end of file
+b23c10ac8f65bc88a6c7d88e140217222eb4cbe5
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 27ca6ef4ad..f60ccaf55c 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -4704,12 +4704,13 @@ sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
 ** SQLite will invoke the destructor function X with parameter P exactly
 ** once, when the metadata is discarded.
 ** SQLite is free to discard the metadata at any time, including: <ul>
-** <li> when the corresponding function parameter changes, or
-** <li> when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
-**      SQL statement, or
-** <li> when sqlite3_set_auxdata() is invoked again on the same parameter, or
-** <li> during the original sqlite3_set_auxdata() call when a memory 
-**      allocation error occurs. </ul>)^
+** <li> ^(when the corresponding function parameter changes)^, or
+** <li> ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
+**      SQL statement)^, or
+** <li> ^(when sqlite3_set_auxdata() is invoked again on the same
+**       parameter)^, or
+** <li> ^(during the original sqlite3_set_auxdata() call when a memory 
+**      allocation error occurs.)^ </ul>
 **
 ** Note the last bullet in particular.  The destructor X in 
 ** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
@@ -5670,8 +5671,8 @@ int sqlite3_load_extension(
 **
 ** ^This interface enables or disables both the C-API
 ** [sqlite3_load_extension()] and the SQL function [load_extension()].
-** Use [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],..)
-** to enable or disable only the C-API.
+** ^(Use [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],..)
+** to enable or disable only the C-API.)^
 **
 ** <b>Security warning:</b> It is recommended that extension loading
 ** be disabled using the [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method