From: drh <drh@noemail.net>
Date: Wed, 6 Jun 2018 18:50:50 +0000 (+0000)
Subject: Fix the sqlite3BeginTrans() calls within the snapshot extension.
X-Git-Tag: version-3.25.0~213
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=685a50ad74167413a4a716d318051b57e72e277d;p=thirdparty%2Fsqlite.git

Fix the sqlite3BeginTrans() calls within the snapshot extension.

FossilOrigin-Name: 1fef7ad25b6a8e59163ac57f5cf0412bfc5b0e9446fd782f5f0a7d7ee11741fc
---

diff --git a/manifest b/manifest
index f37a81d248..26f68548e3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\sminor\soptimization\sto\sOP_Transaction.
-D 2018-06-06T17:45:51.934
+C Fix\sthe\ssqlite3BeginTrans()\scalls\swithin\sthe\ssnapshot\sextension.
+D 2018-06-06T18:50:50.582
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -459,7 +459,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 76b1dc902e4c3930d9a17a40cd8ee2e94b1fd8cce766672caef164a6d5d4df1d
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 F src/loadext.c 6aae5739198d96c51ae6eb97c4a5b1744c22ed7a5a565a5399a717780d48a36b
-F src/main.c 0402e234155e0aad75fe6cd204864f492495be8605a50b4b3d4d72895cced3ce
+F src/main.c a086ab7d6e4e3f07bd5789d16f977d425f9482e7b3baeeb2f17bde0e6bfb2bc1
 F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1730,7 +1730,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 a10662aa915ae2b5a78b3e10920350d32255b2d6b1a8aac0aba1ad173b07ed2b
-R 0414460bef03f5574242d45104db8a7b
+P d80077aee3904e5d93164b342cae14d813de8e84e567462412751e06c7487d41
+R 171a49b9aa8a65c0e7fed5c4fb894ba2
 U drh
-Z 426a1576c4740e63608a04eef5bea89e
+Z a4c79e357ad5b38e16700f26935c42bb
diff --git a/manifest.uuid b/manifest.uuid
index 60bbc07de5..791697ea26 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d80077aee3904e5d93164b342cae14d813de8e84e567462412751e06c7487d41
\ No newline at end of file
+1fef7ad25b6a8e59163ac57f5cf0412bfc5b0e9446fd782f5f0a7d7ee11741fc
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 8e89cc553a..a2b994f9be 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4115,7 +4115,7 @@ int sqlite3_snapshot_get(
     if( iDb==0 || iDb>1 ){
       Btree *pBt = db->aDb[iDb].pBt;
       if( 0==sqlite3BtreeIsInTrans(pBt) ){
-        rc = sqlite3BtreeBeginTrans(pBt, 0);
+        rc = sqlite3BtreeBeginTrans(pBt, 0, 0);
         if( rc==SQLITE_OK ){
           rc = sqlite3PagerSnapshotGet(sqlite3BtreePager(pBt), ppSnapshot);
         }
@@ -4153,7 +4153,7 @@ int sqlite3_snapshot_open(
       if( 0==sqlite3BtreeIsInReadTrans(pBt) ){
         rc = sqlite3PagerSnapshotOpen(sqlite3BtreePager(pBt), pSnapshot);
         if( rc==SQLITE_OK ){
-          rc = sqlite3BtreeBeginTrans(pBt, 0);
+          rc = sqlite3BtreeBeginTrans(pBt, 0, 0);
           sqlite3PagerSnapshotOpen(sqlite3BtreePager(pBt), 0);
         }
       }
@@ -4185,7 +4185,7 @@ int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb){
   if( iDb==0 || iDb>1 ){
     Btree *pBt = db->aDb[iDb].pBt;
     if( 0==sqlite3BtreeIsInReadTrans(pBt) ){
-      rc = sqlite3BtreeBeginTrans(pBt, 0);
+      rc = sqlite3BtreeBeginTrans(pBt, 0, 0);
       if( rc==SQLITE_OK ){
         rc = sqlite3PagerSnapshotRecover(sqlite3BtreePager(pBt));
         sqlite3BtreeCommit(pBt);