database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Bug fix: sqlite_exec() would sometimes return SQLITE_PROTOCOL when it

Browse Source 
should have returned SQLITE_BUSY.  There was also a deadlock that the
previous bug was masking. (CVS 322)

FossilOrigin-Name: 585ed5ebf1c1afc8ae1d569b121208018d8ecd49
This commit is contained in:
drh
2001-12-05 00:21:20 +00:00
parent 6ff13859d5
commit b8ca307e7b
10 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.41 2001/11/23 00:24:12 drh Exp $
** $Id: btree.c,v 1.42 2001/12/05 00:21:20 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -676,6 +676,24 @@ page1_init_failed:
return rc;
}
/*
** If there are no outstanding cursors and we are not in the middle
** of a transaction but there is a read lock on the database, then
** this routine unrefs the first page of the database file which
** has the effect of releasing the read lock.
**
** If there are any outstanding cursors, this routine is a no-op.
**
** If there is a transaction in progress, this routine is a no-op.
*/
static void unlockBtreeIfUnused(Btree *pBt){
if( pBt->inTrans==0 && pBt->pCursor==0 && pBt->page1!=0 ){
sqlitepager_unref(pBt->page1);
pBt->page1 = 0;
pBt->inTrans = 0;
}
}
/*
** Create a new database by initializing the first two pages of the
** file.
@@ -725,33 +743,19 @@ int sqliteBtreeBeginTrans(Btree *pBt){
return rc;
}
}
if( !sqlitepager_isreadonly(pBt->pPager) ){
rc = sqlitepager_write(pBt->page1);
if( rc!=SQLITE_OK ){
return rc;
}
if( sqlitepager_isreadonly(pBt->pPager) ){
return SQLITE_READONLY;
}
rc = sqlitepager_write(pBt->page1);
if( rc==SQLITE_OK ){
rc = newDatabase(pBt);
}
pBt->inTrans = 1;
return rc;
}
/*
** If there are no outstanding cursors and we are not in the middle
** of a transaction but there is a read lock on the database, then
** this routine unrefs the first page of the database file which
** has the effect of releasing the read lock.
**
** If there are any outstanding cursors, this routine is a no-op.
**
** If there is a transaction in progress, this routine is a no-op.
*/
static void unlockBtreeIfUnused(Btree *pBt){
if( pBt->inTrans==0 && pBt->pCursor==0 && pBt->page1!=0 ){
sqlitepager_unref(pBt->page1);
pBt->page1 = 0;
pBt->inTrans = 0;
if( rc==SQLITE_OK ){
pBt->inTrans = 1;
}else{
unlockBtreeIfUnused(pBt);
}
return rc;
}
/*