database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Relax an over-zealous assert() in sqlite3WalUndo().

Browse Source 
FossilOrigin-Name: 8f9d22d58c75ad7476c1eea8ba296347e30b7beb
This commit is contained in:
drh
2010-05-04 17:20:09 +00:00
parent 33bec22fb1
commit cd058ec4ef
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wal.c
View File

@@ -1076,8 +1076,6 @@ int sqlite3WalWriteLock(Wal *pWal, int op){
}
/*
** The Wal object passed to this function must be holding the write-lock.
**
** If any data has been written (but not committed) to the log file, this
** function moves the write-pointer back to the start of the transaction.
**
@@ -1094,9 +1092,9 @@ int sqlite3WalUndo(Wal *pWal, int (*xUndo)(void *, Pgno), void *pUndoCtx){
Pgno iMax = pWal->hdr.iLastPg;
Pgno iFrame;
assert( pWal->lockState==SQLITE_SHM_WRITE );
walIndexReadHdr(pWal, 0);
for(iFrame=pWal->hdr.iLastPg+1; iFrame<=iMax && rc==SQLITE_OK; iFrame++){
assert( pWal->lockState==SQLITE_SHM_WRITE );
rc = xUndo(pUndoCtx, pWal->pWiData[walIndexEntry(iFrame)]);
}
walIndexUnmap(pWal);