From: drh <drh@noemail.net>
Date: Fri, 11 Dec 2015 03:27:36 +0000 (+0000)
Subject: Mention that the snapshot interfaces are only available if SQLite is compiled
X-Git-Tag: version-3.10.0~44^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsnapshot-get;p=thirdparty%2Fsqlite.git

Mention that the snapshot interfaces are only available if SQLite is compiled
with SQLITE_ENABLE_SNAPSHOT.

FossilOrigin-Name: 843c15a552657ca43ff200edb7da7566752d7941
---

diff --git a/manifest b/manifest
index 315698b1df..268c0bf42d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\ssnapshot\stest\sscripts\sif\snot\scompiled\swith\sSQLITE_ENABLE_SNAPSHOT.
-D 2015-12-11T03:20:39.887
+C Mention\sthat\sthe\ssnapshot\sinterfaces\sare\sonly\savailable\sif\sSQLite\sis\scompiled\nwith\sSQLITE_ENABLE_SNAPSHOT.
+D 2015-12-11T03:27:36.868
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -341,7 +341,7 @@ F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
 F src/shell.c abbc74ea43dbf2f306ea18282d666683fb5efab2
-F src/sqlite.h.in e24a1d2e36970ca46beb8002623e1c73eab32063
+F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 F src/sqliteInt.h 5caacf37a776f9d6178e519cb0b5248ca22a3828
@@ -1410,7 +1410,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 93fb8010e4999b6b832d63a7c5a152f65d4415a3
-R f04d367372fb1067c3ab40fd75809ec7
+P 5fd008f0433833e4341d526dcc2387570ffe1fea
+R debac3c9c8655611fddbcca7514e6f4e
 U drh
-Z 1fa92043878ab0279cb81464491eddf8
+Z a48afa3f9104a922fecee9583a7109ec
diff --git a/manifest.uuid b/manifest.uuid
index bf47079e76..b9d344ad3f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5fd008f0433833e4341d526dcc2387570ffe1fea
\ No newline at end of file
+843c15a552657ca43ff200edb7da7566752d7941
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 780a702307..be58c7cd1f 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -7924,8 +7924,15 @@ typedef struct sqlite3_snapshot sqlite3_snapshot;
 ** The [sqlite3_snapshot] object returned from a successful call to
 ** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
 ** to avoid a memory leak.
+**
+** The [sqlite3_snapshot_get()] interface is only available when the
+** SQLITE_ENABLE_SNAPSHOT compile-time option is used.
 */
-SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(sqlite3*,const char*,sqlite3_snapshot **ppSnapshot);
+SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(
+  sqlite3 *db,
+  const char *zSchema,
+  sqlite3_snapshot **ppSnapshot
+);
 
 /*
 ** CAPI3REF: Start a read transaction on an historical snapshot
@@ -7942,8 +7949,15 @@ SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(sqlite3*,const char*,sqlite3_snapsh
 ** following the [BEGIN] that starts a new read transaction.
 ** ^A [snapshot] will fail to open if it has been overwritten by a 
 ** [checkpoint].  
+**
+** The [sqlite3_snapshot_open()] interface is only available when the
+** SQLITE_ENABLE_SNAPSHOT compile-time option is used.
 */
-SQLITE_EXPERIMENTAL int sqlite3_snapshot_open(sqlite3*,const char*,sqlite3_snapshot*);
+SQLITE_EXPERIMENTAL int sqlite3_snapshot_open(
+  sqlite3 *db,
+  const char *zSchema,
+  sqlite3_snapshot *pSnapshot
+);
 
 /*
 ** CAPI3REF: Destroy a snapshot
@@ -7952,6 +7966,9 @@ SQLITE_EXPERIMENTAL int sqlite3_snapshot_open(sqlite3*,const char*,sqlite3_snaps
 ** ^The [sqlite3_snapshot_free(P)] interface destroys [sqlite3_snapshot] P.
 ** The application must eventually free every [sqlite3_snapshot] object
 ** using this routine to avoid a memory leak.
+**
+** The [sqlite3_snapshot_free()] interface is only available when the
+** SQLITE_ENABLE_SNAPSHOT compile-time option is used.
 */
 SQLITE_EXPERIMENTAL void sqlite3_snapshot_free(sqlite3_snapshot*);