diff options
| author | drh <drh@noemail.net> | 2012-09-28 13:05:48 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-09-28 13:05:48 +0000 |
| commit | c4645dacfb435002911b187b474fa0788db9cde0 (patch) | |
| tree | e757051bb0f952d0cb149b62ff6bdbbfdb99eb82 /src/vtab.c | |
| parent | 40eaa08620a75a29f4849cd3572e64feaafce5ec (diff) | |
| parent | f784c1ede942139d136f7c00a1d8fb30a4a31f18 (diff) | |
| download | sqlite-c4645dacfb435002911b187b474fa0788db9cde0.tar.gz sqlite-c4645dacfb435002911b187b474fa0788db9cde0.zip | |
Merge the latest trunk changes (especially "PRAGMA busy_timeout" and the
ORDER BY query planner optimizations) into the sessions branch.
FossilOrigin-Name: 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d
Diffstat (limited to 'src/vtab.c')
| -rw-r--r-- | src/vtab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vtab.c b/src/vtab.c index 50d576fc3..29f097da4 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -528,7 +528,7 @@ static int vtabCallConstructor( /* If everything went according to plan, link the new VTable structure ** into the linked list headed by pTab->pVTable. Then loop through the ** columns of the table to see if any of them contain the token "hidden". - ** If so, set the Column.isHidden flag and remove the token from + ** If so, set the Column COLFLAG_HIDDEN flag and remove the token from ** the type string. */ pVTable->pNext = pTab->pVTable; pTab->pVTable = pVTable; @@ -559,7 +559,7 @@ static int vtabCallConstructor( assert(zType[i-1]==' '); zType[i-1] = '\0'; } - pTab->aCol[iCol].isHidden = 1; + pTab->aCol[iCol].colFlags |= COLFLAG_HIDDEN; } } } |