11diff --git a/sqlite3-binding.c b/sqlite3-binding.c
2- index f077152..98f1857 100644
2+ index a4e32d1..7c35ee9 100644
33--- a/sqlite3-binding.c
44+++ b/sqlite3-binding.c
5- @@ -57211 ,6 +57211 ,38 @@ SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager){
5+ @@ -58311 ,6 +58311 ,38 @@ SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager){
66
77 #endif /* SQLITE_OMIT_DISKIO */
88
@@ -41,7 +41,7 @@ index f077152..98f1857 100644
4141 /************** End of pager.c ***********************************************/
4242 /************** Begin file wal.c *********************************************/
4343 /*
44- @@ -103066 ,6 +103098 ,13 @@ static int resolveAttachExpr(NameContext *pName, Expr *pExpr)
44+ @@ -105977 ,6 +106009 ,13 @@ static int resolveAttachExpr(NameContext *pName, Expr *pExpr)
4545 return rc;
4646 }
4747
@@ -55,7 +55,7 @@ index f077152..98f1857 100644
5555 /*
5656 ** An SQL user-function registered to do the work of an ATTACH statement. The
5757 ** three arguments to the function come directly from an attach statement:
58- @@ -103210 ,11 +103249 ,8 @@ static void attachFunc(
58+ @@ -106120 ,11 +106159 ,8 @@ static void attachFunc(
5959 rc = SQLITE_NOMEM_BKPT;
6060 }
6161
@@ -67,7 +67,7 @@ index f077152..98f1857 100644
6767 int nKey;
6868 char *zKey;
6969 int t = sqlite3_value_type(argv[2]);
70- @@ -118241 ,6 +118277 ,11 @@ SQLITE_PRIVATE void sqlite3Pragma(
70+ @@ -121536 ,6 +121572 ,11 @@ SQLITE_PRIVATE void sqlite3Pragma(
7171 Db *pDb; /* The specific database being pragmaed */
7272 Vdbe *v = sqlite3GetVdbe(pParse); /* Prepared statement */
7373 const PragmaName *pPragma; /* The pragma */
@@ -79,7 +79,7 @@ index f077152..98f1857 100644
7979
8080 if( v==0 ) return;
8181 sqlite3VdbeRunOnlyOnce(v);
82- @@ -118311 ,6 +118352 ,15 @@ SQLITE_PRIVATE void sqlite3Pragma(
82+ @@ -121606 ,6 +121647 ,15 @@ SQLITE_PRIVATE void sqlite3Pragma(
8383 goto pragma_out;
8484 }
8585
@@ -95,15 +95,15 @@ index f077152..98f1857 100644
9595 /* Locate the pragma in the lookup table */
9696 pPragma = pragmaLocate(zLeft);
9797 if( pPragma==0 ) goto pragma_out;
98- @@ -130408 ,7 +130458 ,6 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
98+ @@ -134118 ,7 +134168 ,6 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3RunVacuum(
9999 /* A VACUUM cannot change the pagesize of an encrypted database. */
100100 #ifdef SQLITE_HAS_CODEC
101101 if( db->nextPagesize ){
102102- extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
103103 int nKey;
104104 char *zKey;
105105 sqlite3CodecGetKey(db, iDb, (void**)&zKey, &nKey);
106- @@ -212222 ,3 +212271 ,2569 @@ int sqlite3_user_delete(
106+ @@ -223234 ,3 +223283 ,2569 @@ int sqlite3_user_delete(
107107 }
108108
109109 #endif /* SQLITE_USER_AUTHENTICATION */
@@ -1594,8 +1594,8 @@ index f077152..98f1857 100644
15941594+ pSrc = pDb->pBt;
15951595+
15961596+ rc = sqlite3_exec(db, "BEGIN;", NULL, NULL, NULL);
1597- + rc = sqlite3BtreeBeginTrans(pSrc, 2);
1598- + rc = sqlite3BtreeBeginTrans(pDest, 2);
1597+ + rc = sqlite3BtreeBeginTrans(pSrc, 2, 0 );
1598+ + rc = sqlite3BtreeBeginTrans(pDest, 2, 0 );
15991599+
16001600+ assert( 1==sqlite3BtreeIsInTrans(pDest) );
16011601+ assert( 1==sqlite3BtreeIsInTrans(pSrc) );
@@ -2413,7 +2413,7 @@ index f077152..98f1857 100644
24132413+ ** 3. If that goes ok then commit and put ctx->rekey into ctx->key
24142414+ ** note: don't deallocate rekey since it may be used in a subsequent iteration
24152415+ */
2416- + rc = sqlite3BtreeBeginTrans(pDb->pBt, 1); /* begin write transaction */
2416+ + rc = sqlite3BtreeBeginTrans(pDb->pBt, 1, 0 ); /* begin write transaction */
24172417+ sqlite3PagerPagecount(pPager, &page_count);
24182418+ for(pgno = 1; rc == SQLITE_OK && pgno <= (unsigned int)page_count; pgno++) { /* pgno's start at 1 see pager.c:pagerAcquire */
24192419+ if(!sqlite3pager_is_mj_pgno(pPager, pgno)) { /* skip this page (see pager.c:pagerAcquire for reasoning) */
0 commit comments