diff options
| author |   espie <espie@openbsd.org> | 2012-06-22 17:48:15 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2012-06-22 17:48:15 +0000 |
| commit | f59b59d8f0f4d9c9dc517727087c56fa3b94838f (patch) | |
| tree | d51be9cb4ac356c69faa75e0f255f1ba7857afb5 /lib/libsqlite3/src/vdbe.c | |
| parent | Add initial support for retransmition timeouts and response retries. (diff) | |
| download | wireguard-openbsd-f59b59d8f0f4d9c9dc517727087c56fa3b94838f.tar.xz wireguard-openbsd-f59b59d8f0f4d9c9dc517727087c56fa3b94838f.zip | |
import 3.7.13
okay jasper@
Diffstat (limited to 'lib/libsqlite3/src/vdbe.c')
| -rw-r--r-- | lib/libsqlite3/src/vdbe.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/libsqlite3/src/vdbe.c b/lib/libsqlite3/src/vdbe.c index fa5180c9a42..19c0255b8f2 100644 --- a/lib/libsqlite3/src/vdbe.c +++ b/lib/libsqlite3/src/vdbe.c @@ -2747,7 +2747,7 @@ case OP_Savepoint: { } if( p1==SAVEPOINT_ROLLBACK && (db->flags&SQLITE_InternChanges)!=0 ){ sqlite3ExpirePreparedStatements(db); - sqlite3ResetInternalSchema(db, -1); + sqlite3ResetAllSchemasOfConnection(db); db->flags = (db->flags | SQLITE_InternChanges); } } @@ -3051,7 +3051,7 @@ case OP_VerifyCookie: { ** a v-table method. */ if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){ - sqlite3ResetInternalSchema(db, pOp->p1); + sqlite3ResetOneSchema(db, pOp->p1); } p->expired = 1; @@ -4214,7 +4214,6 @@ case OP_RowData: { assert( pC!=0 ); assert( pC->nullRow==0 ); assert( pC->pseudoTableReg==0 ); - assert( !pC->isSorter ); assert( pC->pCursor!=0 ); pCrsr = pC->pCursor; assert( sqlite3BtreeCursorIsValid(pCrsr) ); @@ -4864,7 +4863,7 @@ case OP_ParseSchema: { db->init.busy = 0; } } - if( rc ) sqlite3ResetInternalSchema(db, -1); + if( rc ) sqlite3ResetAllSchemasOfConnection(db); if( rc==SQLITE_NOMEM ){ goto no_mem; } @@ -5511,7 +5510,7 @@ case OP_JournalMode: { /* out2-prerelease */ if( !sqlite3PagerOkToChangeJournalMode(pPager) ) eNew = eOld; #ifndef SQLITE_OMIT_WAL - zFilename = sqlite3PagerFilename(pPager); + zFilename = sqlite3PagerFilename(pPager, 1); /* Do not allow a transition to journal_mode=WAL for a database ** in temporary storage or if the VFS does not support shared memory @@ -6159,7 +6158,7 @@ vdbe_error_halt: if( rc==SQLITE_IOERR_NOMEM ) db->mallocFailed = 1; rc = SQLITE_ERROR; if( resetSchemaOnFault>0 ){ - sqlite3ResetInternalSchema(db, resetSchemaOnFault-1); + sqlite3ResetOneSchema(db, resetSchemaOnFault-1); } /* This is the only way out of this procedure. We have to |