diff options
| author | drh <drh@noemail.net> | 2012-11-10 01:27:59 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-11-10 01:27:59 +0000 |
| commit | afe5b83dcdee8faffce1b21b8c52a284311ce2a3 (patch) | |
| tree | 593aa5dec5142730ebd6b0e357f1585308c4fcbd /src/os_unix.c | |
| parent | 3dc2b9032fbfaab2c21b8e5755b4c51c7b194ccb (diff) | |
| parent | b43081675d225ef7c5dfbab3adfbeb6c9b509ed2 (diff) | |
| download | sqlite-afe5b83dcdee8faffce1b21b8c52a284311ce2a3.tar.gz sqlite-afe5b83dcdee8faffce1b21b8c52a284311ce2a3.zip | |
Merge the latest changes from trunk: chiefly the outer/inner loop query
optimizer scoring enhancement and the INSTR() function.
FossilOrigin-Name: 2993ca20207f8dac02f58d01e31d68c84328356a
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 9b6c9401a..ca6213943 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5374,8 +5374,13 @@ static int unixDelete( int rc = SQLITE_OK; UNUSED_PARAMETER(NotUsed); SimulateIOError(return SQLITE_IOERR_DELETE); - if( osUnlink(zPath)==(-1) && errno!=ENOENT ){ - return unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); + if( osUnlink(zPath)==(-1) ){ + if( errno==ENOENT ){ + rc = SQLITE_IOERR_DELETE_NOENT; + }else{ + rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath); + } + return rc; } #ifndef SQLITE_DISABLE_DIRSYNC if( (dirSync & 1)!=0 ){ |