diff options
| author | drh <drh@noemail.net> | 2014-11-18 21:20:57 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-11-18 21:20:57 +0000 |
| commit | 04e8a5866948996e4dd1540a9a736d00609c27e8 (patch) | |
| tree | fcf53188c46e77ce3d90818bc17e118298813b18 /src/vdbeblob.c | |
| parent | ca3e10ea37c4808fa84063f06b02229801b28cc0 (diff) | |
| parent | 64b600ff13d4bac1d459cf54b649b45e520aba4c (diff) | |
| download | sqlite-04e8a5866948996e4dd1540a9a736d00609c27e8.tar.gz sqlite-04e8a5866948996e4dd1540a9a736d00609c27e8.zip | |
Merge recent trunk enhancements, including the read-after-ROLLBACK change
and the addition of sqlite3_stmt_scanstatus() support, as well as various
minor bug fixes.
FossilOrigin-Name: f09055f3c4348264c7336f90646375f0d98b061e
Diffstat (limited to 'src/vdbeblob.c')
| -rw-r--r-- | src/vdbeblob.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/vdbeblob.c b/src/vdbeblob.c index f5267cda8..4061e9780 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -380,7 +380,6 @@ static int blobReadWrite( if( n<0 || iOffset<0 || (iOffset+n)>p->nByte ){ /* Request is out of range. Return a transient error. */ rc = SQLITE_ERROR; - sqlite3Error(db, SQLITE_ERROR); }else if( v==0 ){ /* If there is no statement handle, then the blob-handle has ** already been invalidated. Return SQLITE_ABORT in this case. @@ -422,10 +421,10 @@ static int blobReadWrite( sqlite3VdbeFinalize(v); p->pStmt = 0; }else{ - db->errCode = rc; v->rc = rc; } } + sqlite3Error(db, rc); rc = sqlite3ApiExit(db, rc); sqlite3_mutex_leave(db->mutex); return rc; |