diff options
| author | drh <drh@noemail.net> | 2013-10-10 20:13:18 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-10-10 20:13:18 +0000 |
| commit | a63b85299290b7eca076ea6e031e7f43d4feadcf (patch) | |
| tree | e925eb05965ec76f37b6483581d5bd8f8ea9e53b /src/btree.c | |
| parent | 59255f9a98381960cfede9253277f128895531f6 (diff) | |
| parent | 7e65c94bdc689bebd222321dec5c034194267ac9 (diff) | |
| download | sqlite-a63b85299290b7eca076ea6e031e7f43d4feadcf.tar.gz sqlite-a63b85299290b7eca076ea6e031e7f43d4feadcf.zip | |
Synchronize with the trunk.
FossilOrigin-Name: 136445ba020c9475d3f5a7843d7d0add98477138
Diffstat (limited to 'src/btree.c')
| -rw-r--r-- | src/btree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/btree.c b/src/btree.c index 2ea55886a..3ce70fe48 100644 --- a/src/btree.c +++ b/src/btree.c @@ -2508,7 +2508,6 @@ static int lockBtree(BtShared *pBt){ assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) ); pBt->pPage1 = pPage1; pBt->nPage = nPage; -assert( pPage1->leaf==0 || pPage1->leaf==1 ); return SQLITE_OK; page1_init_failed: @@ -2668,7 +2667,7 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ if( p->inTrans==TRANS_WRITE || (p->inTrans==TRANS_READ && !wrflag) ){ goto trans_begun; } - assert( IfNotOmitAV(pBt->bDoTruncate)==0 ); + assert( pBt->inTransaction==TRANS_WRITE || IfNotOmitAV(pBt->bDoTruncate)==0 ); /* Write transactions are not possible on a read-only database */ if( (pBt->btsFlags & BTS_READ_ONLY)!=0 && wrflag ){ |