Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove duplicated line of code. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | begin-concurrent |
| Files: | files | file ages | folders |
| SHA1: |
47280f2a2b7cc83bf11ab86284204f56 |
| User & Date: | mistachkin 2015-08-24 22:06:02 |
Context
|
2015-08-25
| ||
| 11:16 | Merge latest trunk changes with this branch. (check-in: 3e7d6dd6 user: dan tags: begin-concurrent) | |
|
2015-08-24
| ||
| 22:06 | Remove duplicated line of code. (check-in: 47280f2a user: mistachkin tags: begin-concurrent) | |
| 19:56 | Change "BEGIN UNLOCKED" to "BEGIN CONCURRENT". (check-in: ba1ab858 user: dan tags: begin-concurrent) | |
Changes
Changes to src/vdbe.c.
6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 |
case OP_TableLock: {
u8 isWriteLock = (u8)pOp->p3;
#ifdef SQLITE_ENABLE_CONCURRENT
if( isWriteLock && db->bConcurrent && pOp->p2==1 ){
rc = SQLITE_ERROR;
sqlite3VdbeError(p,
"cannot modify database schema within CONCURRENT transaction");
rc = SQLITE_ERROR;
break;
}
#endif
if( isWriteLock || 0==(db->flags&SQLITE_ReadUncommitted) ){
int p1 = pOp->p1;
assert( p1>=0 && p1<db->nDb );
assert( DbMaskTest(p->btreeMask, p1) );
|
< |
6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 |
case OP_TableLock: {
u8 isWriteLock = (u8)pOp->p3;
#ifdef SQLITE_ENABLE_CONCURRENT
if( isWriteLock && db->bConcurrent && pOp->p2==1 ){
rc = SQLITE_ERROR;
sqlite3VdbeError(p,
"cannot modify database schema within CONCURRENT transaction");
break;
}
#endif
if( isWriteLock || 0==(db->flags&SQLITE_ReadUncommitted) ){
int p1 = pOp->p1;
assert( p1>=0 && p1<db->nDb );
assert( DbMaskTest(p->btreeMask, p1) );
|