diff options
| author | drh <drh@noemail.net> | 2014-08-26 02:15:07 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-08-26 02:15:07 +0000 |
| commit | e1ed0b0e1787b0e5c6b2b59de4e2f161a82bec22 (patch) | |
| tree | 8db8af1187650d9cb47db76e85cfb7aa4b0a8682 /src/vdbeblob.c | |
| parent | 2571e4eddd05dceb9c707e8356153d0836d84228 (diff) | |
| parent | 05bbb2e824df2af559aaf301a4a44f16c080ffc8 (diff) | |
| download | sqlite-e1ed0b0e1787b0e5c6b2b59de4e2f161a82bec22.tar.gz sqlite-e1ed0b0e1787b0e5c6b2b59de4e2f161a82bec22.zip | |
Merge recent performance enhancements and the CAST operator enhancements
into the sessions branch.
FossilOrigin-Name: 08ae974ac80fabe53f515bbbd93ccf55de8ee671
Diffstat (limited to 'src/vdbeblob.c')
| -rw-r--r-- | src/vdbeblob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vdbeblob.c b/src/vdbeblob.c index 7d1a3c6b7..ca44866eb 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -322,7 +322,7 @@ blob_open_out: if( pBlob && pBlob->pStmt ) sqlite3VdbeFinalize((Vdbe *)pBlob->pStmt); sqlite3DbFree(db, pBlob); } - sqlite3Error(db, rc, (zErr ? "%s" : 0), zErr); + sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr); sqlite3DbFree(db, zErr); sqlite3ParserReset(pParse); sqlite3StackFree(db, pParse); @@ -375,7 +375,7 @@ 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, 0); + 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. @@ -479,7 +479,7 @@ int sqlite3_blob_reopen(sqlite3_blob *pBlob, sqlite3_int64 iRow){ char *zErr; rc = blobSeekToRow(p, iRow, &zErr); if( rc!=SQLITE_OK ){ - sqlite3Error(db, rc, (zErr ? "%s" : 0), zErr); + sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr); sqlite3DbFree(db, zErr); } assert( rc!=SQLITE_SCHEMA ); |