database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Fix the problems demonstrated in tkt35xx.test in a different way to (5936). (CVS 5938)

Browse Source 
FossilOrigin-Name: ddf980a50127a9de35edeca5549f4b51e3f733e6
This commit is contained in:
danielk1977
2008-11-21 09:09:01 +00:00
parent 3e168ebec2
commit b247c21c15
5 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
** @(#) $Id: pager.c,v 1.507 2008/11/21 03:23:43 drh Exp $
** @(#) $Id: pager.c,v 1.508 2008/11/21 09:09:02 danielk1977 Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -1517,20 +1517,6 @@ static int pager_playback(Pager *pPager, int isHot){
assert( 0 );
end_playback:
/* There may be pages in cache that are dirty but which were not in
** the rollback journal. Such pages would have been taken out of the
** freelist (and hence marked as DontRollback). All such pages must
** be reinitialized.
*/
if( rc==SQLITE_OK && pPager->xReiniter ){
PgHdr *pDirty; /* List of page that are still dirty */
pDirty = sqlite3PcacheDirtyList(pPager->pPCache);
while( pDirty ){
pPager->xReiniter(pDirty);
sqlite3PcacheMakeClean(pDirty);
pDirty = pDirty->pDirty;
}
}
if( rc==SQLITE_OK ){
zMaster = pPager->pTmpSpace;
rc = readMasterJournal(pPager->jfd, zMaster, pPager->pVfs->mxPathname+1);