diff options
| author | drh <drh@noemail.net> | 2013-11-26 18:00:29 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-11-26 18:00:29 +0000 |
| commit | 1b2ee4fe1afb4edd3d04e62daeb133df41809e38 (patch) | |
| tree | 3f90016343959f3349a8086cb43c38cb4de975a3 /src/vdbeblob.c | |
| parent | 212c6be1417860712de4b93b31342b72c9fa89dd (diff) | |
| parent | 55fcab39be8186caac6c7d1262a7c943564623bb (diff) | |
| download | sqlite-1b2ee4fe1afb4edd3d04e62daeb133df41809e38.tar.gz sqlite-1b2ee4fe1afb4edd3d04e62daeb133df41809e38.zip | |
Merge in performance enhancements from trunk.
FossilOrigin-Name: fc9ae839569eb28eb734c52d95676c59b2e27494
Diffstat (limited to 'src/vdbeblob.c')
| -rw-r--r-- | src/vdbeblob.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/vdbeblob.c b/src/vdbeblob.c index ee660603e..a1c44ebf3 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -66,7 +66,8 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){ rc = sqlite3_step(p->pStmt); if( rc==SQLITE_ROW ){ - u32 type = v->apCsr[0]->aType[p->iCol]; + VdbeCursor *pC = v->apCsr[0]; + u32 type = pC->aType[p->iCol]; if( type<12 ){ zErr = sqlite3MPrintf(p->db, "cannot open value of type %s", type==0?"null": type==7?"real": "integer" @@ -75,9 +76,9 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){ sqlite3_finalize(p->pStmt); p->pStmt = 0; }else{ - p->iOffset = v->apCsr[0]->aOffset[p->iCol]; + p->iOffset = pC->aType[p->iCol + pC->nField]; p->nByte = sqlite3VdbeSerialTypeLen(type); - p->pCsr = v->apCsr[0]->pCursor; + p->pCsr = pC->pCursor; sqlite3BtreeEnterCursor(p->pCsr); sqlite3BtreeCacheOverflow(p->pCsr); sqlite3BtreeLeaveCursor(p->pCsr); @@ -332,6 +333,7 @@ blob_open_out: } sqlite3Error(db, rc, (zErr ? "%s" : 0), zErr); sqlite3DbFree(db, zErr); + sqlite3ParserReset(pParse); sqlite3StackFree(db, pParse); rc = sqlite3ApiExit(db, rc); sqlite3_mutex_leave(db->mutex); |