diff options
| author |   jturner <jturner@openbsd.org> | 2015-09-12 02:08:34 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2015-09-12 02:08:34 +0000 |
| commit | 9002a9ec67ed1654a017252f6e4bc93deef91d2a (patch) | |
| tree | 775f5d1fe0cf77f56c7617f4e867764206a537c7 /lib/libsqlite3/src/attach.c | |
| parent | add missing functions to NAME; (diff) | |
| download | wireguard-openbsd-9002a9ec67ed1654a017252f6e4bc93deef91d2a.tar.xz wireguard-openbsd-9002a9ec67ed1654a017252f6e4bc93deef91d2a.zip | |
Update sqlite3 to 3.8.11.1. Bump major, regen .pc and header. Changes
available here: http://sqlite.org/changes.html
Tested in bulk by aja@. ok landry@ "Please crank sqlite when you get
this mail." deraadt@
Diffstat (limited to 'lib/libsqlite3/src/attach.c')
| -rw-r--r-- | lib/libsqlite3/src/attach.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libsqlite3/src/attach.c b/lib/libsqlite3/src/attach.c index 7e35fa67c61..2ab55e6ed62 100644 --- a/lib/libsqlite3/src/attach.c +++ b/lib/libsqlite3/src/attach.c @@ -298,7 +298,7 @@ static void detachFunc( sqlite3BtreeClose(pDb->pBt); pDb->pBt = 0; pDb->pSchema = 0; - sqlite3ResetAllSchemasOfConnection(db); + sqlite3CollapseDatabaseArray(db); return; detach_error: @@ -332,7 +332,6 @@ static void codeAttach( SQLITE_OK!=(rc = resolveAttachExpr(&sName, pDbname)) || SQLITE_OK!=(rc = resolveAttachExpr(&sName, pKey)) ){ - pParse->nErr++; goto attach_end; } @@ -360,7 +359,7 @@ static void codeAttach( assert( v || db->mallocFailed ); if( v ){ - sqlite3VdbeAddOp3(v, OP_Function, 0, regArgs+3-pFunc->nArg, regArgs+3); + sqlite3VdbeAddOp3(v, OP_Function0, 0, regArgs+3-pFunc->nArg, regArgs+3); assert( pFunc->nArg==-1 || (pFunc->nArg&0xff)==pFunc->nArg ); sqlite3VdbeChangeP5(v, (u8)(pFunc->nArg)); sqlite3VdbeChangeP4(v, -1, (char *)pFunc, P4_FUNCDEF); |