database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Change the name of SQLITE_READONLY_CANTLOCK to SQLITE_READONLY_CANTINIT.

Browse Source 
FossilOrigin-Name: 6d7f94faa7e6de62f82bc6cac019508a9c1ffd6fa1d14f52fa93e9c06afdd32f
This commit is contained in:
drh
2017-11-08 17:32:12 +00:00
parent 6c9d8f640b
commit 7e45e3a5d7
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wal.c
View File

@@ -2099,7 +2099,7 @@ static int walIndexReadHdr(Wal *pWal, int *pChanged){
*/
assert( pChanged );
rc = walIndexPage(pWal, 0, &page0);
if( rc==SQLITE_READONLY_CANTLOCK ){
if( rc==SQLITE_READONLY_CANTINIT ){
assert( page0==0 && pWal->writeLock==0 );
pWal->bUnlocked = 1;
pWal->exclusiveMode = WAL_HEAPMEMORY_MODE;
@@ -2219,7 +2219,7 @@ static int walBeginUnlocked(Wal *pWal, int *pChanged){
** the unlocked transaction, as the other client may overwrite wal
** frames that this client is still using. */
rc = sqlite3OsShmMap(pWal->pDbFd, 0, WALINDEX_PGSZ, 0, &pDummy);
if( rc!=SQLITE_READONLY_CANTLOCK ){
if( rc!=SQLITE_READONLY_CANTINIT ){
assert( rc!=SQLITE_OK );
rc = (rc==SQLITE_READONLY ? WAL_RETRY : rc);
goto begin_unlocked_out;
@@ -2509,7 +2509,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
}
if( mxI==0 ){
assert( rc==SQLITE_BUSY || (pWal->readOnly & WAL_SHM_RDONLY)!=0 );
return rc==SQLITE_BUSY ? WAL_RETRY : SQLITE_READONLY_CANTLOCK;
return rc==SQLITE_BUSY ? WAL_RETRY : SQLITE_READONLY_CANTINIT;
}
rc = walLockShared(pWal, WAL_READ_LOCK(mxI));