From 5b068f863228ba1f074e2999a7dc1527e34d9612 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 21 Mar 2013 15:57:32 +0000 Subject: [PATCH] Fix a problem when opening a write-transaction while there exist read-only b-tree cursors in mmap mode. FossilOrigin-Name: 32e0bbb73609ac3ad096a60f1de3095bc79fb0cc --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/btree.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 870e5cce8d..8819c52a55 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\suse\sthe\sLinux\smremap()\scall.\sUse\sthe\ssame\sstrategy\sfor\sxMremap()\sas\son\sOSX\sinstead. -D 2013-03-21T14:47:47.427 +C Fix\sa\sproblem\swhen\sopening\sa\swrite-transaction\swhile\sthere\sexist\sread-only\sb-tree\scursors\sin\smmap\smode. +D 2013-03-21T15:57:32.562 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c b2cac9f7993f3f9588827b824b1501d0c820fa68 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c d4d551f05a555926a7c0f49c2e263f7ee2b1c59f +F src/btree.c dd4683fa671f0b2b4bc0831036adaa2a5d1806ee F src/btree.h d3259057a38494c4c4358e377032158c762e3d8b F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2 F src/build.c 375e5df716e03b9343c5e1211be3b24e6d6dff05 @@ -1039,7 +1039,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 9529ed88a71fee02fae72dc86f0669bd6856ff92 -R 7e61f02cabbded666ed9e0992a636a37 +P 5ed8ad780c991d2ca44003ee84350fb5e95ad58e +R fc9bd174ea58046e3b5bc29693aabeb6 U dan -Z 67f89f7e2101ab4157bb24e7a7ac302a +Z 811da101d49a049638aae5d61fad1590 diff --git a/manifest.uuid b/manifest.uuid index f10e3bc724..95a0f78145 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5ed8ad780c991d2ca44003ee84350fb5e95ad58e \ No newline at end of file +32e0bbb73609ac3ad096a60f1de3095bc79fb0cc \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 2b7872fa8c..0a51ff0301 100644 --- a/src/btree.c +++ b/src/btree.c @@ -2595,7 +2595,7 @@ static int btreeSwapOutMmap(BtShared *pBt){ MemPage *pPg = pCsr->apPage[0]; if( pPg->pDbPage->flags & PGHDR_MMAP ){ MemPage *pNew = 0; - rc = btreeGetPage(pBt, pPg->pgno, &pNew, 0, 0); + rc = getAndInitPage(pBt, pPg->pgno, &pNew, 0); if( rc==SQLITE_OK && pCsr->iPage==0 ){ pCsr->info.pCell = pNew->aData + (pCsr->info.pCell - pPg->aData); } -- 2.47.2