In the async VFS, treat the new error code SQLITE_IOERR_DELETE_NOENT as success for...

FossilOrigin-Name: c507ca4a8eb255923ff32001a1903dc85960f485

diff --git a/ext/async/sqlite3async.c b/ext/async/sqlite3async.c
index 0814da7c71230e00ef4758942c3fefe6a655728d..4ab39cac351ace28e1f59e7ceeb3bc570234e655 100644 (file)
--- a/ext/async/sqlite3async.c
+++ b/ext/async/sqlite3async.c
@@ -1510,6 +1510,7 @@ static void asyncWriterThread(void){
       case ASYNC_DELETE:
         ASYNC_TRACE(("DELETE %s\n", p->zBuf));
         rc = pVfs->xDelete(pVfs, p->zBuf, (int)p->iOffset);
+        if( rc==SQLITE_IOERR_DELETE_NOENT ) rc = SQLITE_OK;
         break;
 
       case ASYNC_OPENEXCLUSIVE: {

diff --git a/manifest b/manifest
index e9bc4c0b636e7e05913b0de1e2c3bb08784a646a..dfb8addf9582be78fa02804cde862c15ea245040 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\sconstant-refactoring-in-triggers\sbranch\swith\sthe\strunk.
-D 2012-12-06T19:41:44.312
+C In\sthe\sasync\sVFS,\streat\sthe\snew\serror\scode\sSQLITE_IOERR_DELETE_NOENT\sas\ssuccess\sfor\sxDelete.
+D 2012-12-06T23:16:58.098
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -23,7 +23,7 @@ F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
 F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/async/README.txt 048f24b1b8f28eb31fb84aac28e70a6ce3de6973
-F ext/async/sqlite3async.c 733a9f21b1066f44ff07b9c0da973b1e483d1e0c
+F ext/async/sqlite3async.c b5a3e30f538a9ffe81538b3063b4d5963f9bb422
 F ext/async/sqlite3async.h a21e1252deb14a2c211f0e165c4b9122a8f1f344
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
@@ -1025,7 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 1a63b1d5fa5d79f96eddbda6d94bc10248863710 0c31a46801746191d1a53332d75beda880fe1fd7
-R 919f27f45c7dc1e6e97e702080115442
-U dan
-Z b91d171a2c4500533640db47363b9d5b
+P 79ef8e3c7798dfdf37359ac816e886a43ba9d98d
+R fc13000d0eb5e984211666c5c06b93d1
+U mistachkin
+Z bfcb502a603625c76bbdc1bb1f12b4f2

diff --git a/manifest.uuid b/manifest.uuid
index 7f3661b4f307d2d139daebbe20db82bae87a323a..a04d50103c2e7b3e7799ec011f7ec41341fe66a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79ef8e3c7798dfdf37359ac816e886a43ba9d98d
\ No newline at end of file
+c507ca4a8eb255923ff32001a1903dc85960f485
\ No newline at end of file