diff options
| author | drh <drh@noemail.net> | 2010-02-23 17:36:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-02-23 17:36:32 +0000 |
| commit | 9978c97ec5d480741365687534690f04bc8cc6e4 (patch) | |
| tree | 85ee2b948fb789b9245796ca35a2e947e8e662e2 /src/vdbeblob.c | |
| parent | 127f9d75e289e3a4cd45a16889bced0d94a1a608 (diff) | |
| download | sqlite-9978c97ec5d480741365687534690f04bc8cc6e4.tar.gz sqlite-9978c97ec5d480741365687534690f04bc8cc6e4.zip | |
Remove the obsolete sqlite3SafetyOn() mechanism. Add additional logging
output for CORRUPT, and CANTOPEN errors.
FossilOrigin-Name: 7c4cca6d1a23a6d1591b62f58c3716a944969947
Diffstat (limited to 'src/vdbeblob.c')
| -rw-r--r-- | src/vdbeblob.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/vdbeblob.c b/src/vdbeblob.c index 6a6c6a71f..2871f1ad1 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -95,13 +95,6 @@ int sqlite3_blob_open( memset(pParse, 0, sizeof(Parse)); pParse->db = db; - if( sqlite3SafetyOn(db) ){ - sqlite3DbFree(db, zErr); - sqlite3StackFree(db, pParse); - sqlite3_mutex_leave(db->mutex); - return SQLITE_MISUSE; - } - sqlite3BtreeEnterAll(db); pTab = sqlite3LocateTable(pParse, 0, zTable, zDb); if( pTab && IsVirtual(pTab) ){ @@ -121,7 +114,6 @@ int sqlite3_blob_open( pParse->zErrMsg = 0; } rc = SQLITE_ERROR; - (void)sqlite3SafetyOff(db); sqlite3BtreeLeaveAll(db); goto blob_open_out; } @@ -136,7 +128,6 @@ int sqlite3_blob_open( sqlite3DbFree(db, zErr); zErr = sqlite3MPrintf(db, "no such column: \"%s\"", zColumn); rc = SQLITE_ERROR; - (void)sqlite3SafetyOff(db); sqlite3BtreeLeaveAll(db); goto blob_open_out; } @@ -177,7 +168,6 @@ int sqlite3_blob_open( sqlite3DbFree(db, zErr); zErr = sqlite3MPrintf(db, "cannot open %s column for writing", zFault); rc = SQLITE_ERROR; - (void)sqlite3SafetyOff(db); sqlite3BtreeLeaveAll(db); goto blob_open_out; } @@ -227,8 +217,7 @@ int sqlite3_blob_open( } sqlite3BtreeLeaveAll(db); - rc = sqlite3SafetyOff(db); - if( NEVER(rc!=SQLITE_OK) || db->mallocFailed ){ + if( db->mallocFailed ){ goto blob_open_out; } |