From: drh <drh@noemail.net>
Date: Fri, 8 Apr 2016 19:44:31 +0000 (+0000)
Subject: Update documentation for sqlite3_snapshot_open().  No code changes.
X-Git-Tag: version-3.13.0~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11b264019ca5d5566ce65d4b0f7c949c945e4952;p=thirdparty%2Fsqlite.git

Update documentation for sqlite3_snapshot_open().  No code changes.

FossilOrigin-Name: 1dfa5234d3ee38c6af2d18a6294afa93232821e7
---

diff --git a/manifest b/manifest
index 2fe24961ad..391bb710ba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sfor\sticket\s[7f7f8026eda387d544].
-D 2016-04-07T21:14:35.631
+C Update\sdocumentation\sfor\ssqlite3_snapshot_open().\s\sNo\scode\schanges.
+D 2016-04-08T19:44:31.621
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@@ -377,7 +377,7 @@ F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
 F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
 F src/select.c d9b8628acb98f1a38921888d823a6b70c7a7774b
 F src/shell.c b7922fa264f8c8d72a5ec6dd0b091e15a93c4de5
-F src/sqlite.h.in 7f437b068314f053e6417d452c59f08d05092591
+F src/sqlite.h.in c8f41612dc1a9b5212a891e1b65a5f589b8b884a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
 F src/sqliteInt.h 292fbc9dd900c64e93a15dfd73ccd9e03475e6a6
@@ -1482,7 +1482,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 c4b9c611bdcd85f31d68aaf114ee34a9f27eba6d
-R 761448207abe334cc70f1f29da291a77
+P 87aa9357fbe6749bae60e30af54ca16e48678802
+R 531fbfe926ebd5a12c160e3eacaeb55c
 U drh
-Z 2b1e9b9a1cc02d13e96c99c5d4c59d63
+Z f425ca7a54f66ad3173991f366076015
diff --git a/manifest.uuid b/manifest.uuid
index a8908af92e..74ac1a36d9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87aa9357fbe6749bae60e30af54ca16e48678802
\ No newline at end of file
+1dfa5234d3ee38c6af2d18a6294afa93232821e7
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index b28e1ba14a..33b6d1f5ec 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -8081,20 +8081,29 @@ SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(
 ** CAPI3REF: Start a read transaction on an historical snapshot
 ** EXPERIMENTAL
 **
-** ^The [sqlite3_snapshot_open(D,S,P)] interface attempts to move the
-** read transaction that is currently open on schema S of
-** [database connection] D so that it refers to historical [snapshot] P.
+** ^The [sqlite3_snapshot_open(D,S,P)] interface starts a
+** read transaction for schema S of
+** [database connection] D such that the read transaction
+** refers to historical [snapshot] P, rather than the most
+** recent change to the database.
 ** ^The [sqlite3_snapshot_open()] interface returns SQLITE_OK on success
 ** or an appropriate [error code] if it fails.
 **
 ** ^In order to succeed, a call to [sqlite3_snapshot_open(D,S,P)] must be
-** the first operation, apart from other sqlite3_snapshot_open() calls,
-** following the [BEGIN] that starts a new read transaction.
-** ^A [snapshot] will fail to open if it has been overwritten by a 
+** the first operation following the [BEGIN] that takes the schema S
+** out of [autocommit mode].
+** ^In other words, schema S must not currently be in
+** a transaction for [sqlite3_snapshot_open(D,S,P)] to work, but the
+** database connection D must be out of [autocommit mode].
+** ^A [snapshot] will fail to open if it has been overwritten by a
 ** [checkpoint].
-** ^A [snapshot] will fail to open if the database connection D has not
-** previously completed at least one read operation against the database 
-** file.  (Hint: Run "[PRAGMA application_id]" against a newly opened
+** ^(A call to [sqlite3_snapshot_open(D,S,P)] will fail if the
+** database connection D does not know that the database file for
+** schema S is in [WAL mode].  A database connection might not know
+** that the database file is in [WAL mode] if there has been no prior
+** I/O on that database connection, or if the database entered [WAL mode] 
+** after the most recent I/O on the database connection.)^
+** (Hint: Run "[PRAGMA application_id]" against a newly opened
 ** database connection in order to make it ready to use snapshots.)
 **
 ** The [sqlite3_snapshot_open()] interface is only available when the