diff options
| author | drh <drh@noemail.net> | 2017-08-22 15:21:54 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2017-08-22 15:21:54 +0000 |
| commit | 2e2338101a28a647eaa37cf20945087fd96aaf10 (patch) | |
| tree | ef1b122644b70241cb8d24bd24e101b452823edf | |
| parent | b40f06c62dc64e516510b8221950e1d6b687f7ee (diff) | |
| download | sqlite-2e2338101a28a647eaa37cf20945087fd96aaf10.tar.gz sqlite-2e2338101a28a647eaa37cf20945087fd96aaf10.zip | |
Fix error tests in seldom-used compile-time branches of the unix backend.
FossilOrigin-Name: 885c2b44a44f8d054014e4079b2cac8279c11d13206d5b5215189ef75b9c5254
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 6 |
3 files changed, 10 insertions, 10 deletions
@@ -1,5 +1,5 @@ -C Remove\san\sunnecessary\sconditional. -D 2017-08-21T02:20:57.510 +C Fix\serror\stests\sin\sseldom-used\scompile-time\sbranches\sof\sthe\sunix\sbackend. +D 2017-08-22T15:21:54.760 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016 @@ -440,7 +440,7 @@ F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24 F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 -F src/os_unix.c 0a7730f6cb797ba1fd12825e4ea751e1325041410c063c258e30089ca71f9a88 +F src/os_unix.c 489aa972ccc34f7b4770b891694b32101c59ddd4be4ef0ddd9a4da58c145c1a6 F src/os_win.c 964165b66cde03abc72fe948198b01be608436894732eadb94c8720d2467f223 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c c1dc0609f04a0659519bb2b8ca1440a64b0ad82b6c2afd675f1a50f6c918321a @@ -1649,7 +1649,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 6538ef7b6b56c7a6629a0bb7418910c64c8b2e73af2296a116c073ecf2e0d429 -R 44db9cb33f37af7df65ab136e59cd109 +P 56d19f9fd7b01d4ed5c3e7309977b43fedffee168c9760d3e3b7e885790f781e +R fadb89000aeb50524d087e05d444ff10 U drh -Z bcd0fe0605e077fa72b238dc51f819ad +Z b11624f2af9f39a4604e682002fd5d5e diff --git a/manifest.uuid b/manifest.uuid index 40286a069..9cd165bc2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -56d19f9fd7b01d4ed5c3e7309977b43fedffee168c9760d3e3b7e885790f781e
\ No newline at end of file +885c2b44a44f8d054014e4079b2cac8279c11d13206d5b5215189ef75b9c5254
\ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index bd646d6e7..0d7e49414 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2321,7 +2321,7 @@ static int flockCheckReservedLock(sqlite3_file *id, int *pResOut){ OSTRACE(("TEST WR-LOCK %d %d %d (flock)\n", pFile->h, rc, reserved)); #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS - if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){ + if( (rc & 0xff) == SQLITE_IOERR ){ rc = SQLITE_OK; reserved=1; } @@ -2388,7 +2388,7 @@ static int flockLock(sqlite3_file *id, int eFileLock) { OSTRACE(("LOCK %d %s %s (flock)\n", pFile->h, azFileLock(eFileLock), rc==SQLITE_OK ? "ok" : "failed")); #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS - if( (rc & SQLITE_IOERR) == SQLITE_IOERR ){ + if( (rc & 0xff) == SQLITE_IOERR ){ rc = SQLITE_BUSY; } #endif /* SQLITE_IGNORE_FLOCK_LOCK_ERRORS */ @@ -2925,7 +2925,7 @@ static int afpLock(sqlite3_file *id, int eFileLock){ /* Can't reestablish the shared lock. Sqlite can't deal, this is ** a critical I/O error */ - rc = ((failed & SQLITE_IOERR) == SQLITE_IOERR) ? failed2 : + rc = ((failed & 0xff) == SQLITE_IOERR) ? failed2 : SQLITE_IOERR_LOCK; goto afp_end_lock; } |