summaryrefslogtreecommitdiffstats
path: root/lib/libsqlite3/src/wal.c
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2013-03-18 10:44:54 +0000
committerespie <espie@openbsd.org>2013-03-18 10:44:54 +0000
commitf1b0c374cb714f5a02b914bea387b6b573687eb8 (patch)
treee508042c8370fb39b8acd5eb62247a7ad51310e0 /lib/libsqlite3/src/wal.c
parentProvide a way for *drm(4) to prevent the VGA text console wsdisplay(4) instance (diff)
downloadwireguard-openbsd-f1b0c374cb714f5a02b914bea387b6b573687eb8.tar.xz
wireguard-openbsd-f1b0c374cb714f5a02b914bea387b6b573687eb8.zip
update to 3.7.15.2, tested by landry@/miod@
Diffstat (limited to 'lib/libsqlite3/src/wal.c')
-rw-r--r--lib/libsqlite3/src/wal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libsqlite3/src/wal.c b/lib/libsqlite3/src/wal.c
index cc166ba4303..0d7271bf04f 100644
--- a/lib/libsqlite3/src/wal.c
+++ b/lib/libsqlite3/src/wal.c
@@ -2518,7 +2518,7 @@ int sqlite3WalUndo(Wal *pWal, int (*xUndo)(void *, Pgno), void *pUndoCtx){
assert( walFramePgno(pWal, iFrame)!=1 );
rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
}
- walCleanupHash(pWal);
+ if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
}
assert( rc==SQLITE_OK );
return rc;
@@ -2828,7 +2828,7 @@ int sqlite3WalFrames(
*/
if( isCommit && (sync_flags & WAL_SYNC_TRANSACTIONS)!=0 ){
if( pWal->padToSectorBoundary ){
- int sectorSize = sqlite3OsSectorSize(pWal->pWalFd);
+ int sectorSize = sqlite3SectorSize(pWal->pWalFd);
w.iSyncPoint = ((iOffset+sectorSize-1)/sectorSize)*sectorSize;
while( iOffset<w.iSyncPoint ){
rc = walWriteOneFrame(&w, pLast, nTruncate, iOffset);