summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--storage/connect/tabtbl.cpp10
-rw-r--r--storage/connect/tabutil.cpp6
2 files changed, 8 insertions, 8 deletions
diff --git a/storage/connect/tabtbl.cpp b/storage/connect/tabtbl.cpp
index 7b10089ea36..7e89cccf583 100644
--- a/storage/connect/tabtbl.cpp
+++ b/storage/connect/tabtbl.cpp
@@ -239,14 +239,10 @@ bool TDBTBL::InitTableList(PGLOBAL g)
// We must allocate subtable columns before GetMaxSize is called
// because some (PLG, ODBC?) need to have their columns attached.
// Real initialization will be done later.
- for (PCOL cp = Columns; cp; cp = cp->GetNext())
- if (!cp->IsSpecial()) {
- if (((PPRXCOL)cp)->Init(g) && !Accept)
+ for (colp = Columns; colp; colp = colp->GetNext())
+ if (!colp->IsSpecial())
+ if (((PPRXCOL)colp)->Init(g) && !Accept)
return TRUE;
- else // this is needed by some tables (which?)
- colp->SetColUse(cp->GetColUse());
-
- } // endif !special
if (Tablist)
Tablist->Link(tabp);
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp
index 2c14b711f86..c55b8d1fa5c 100644
--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
@@ -531,8 +531,12 @@ bool PRXCOL::Init(PGLOBAL g)
Colp = tdbp->Tdbp->ColDB(g, NULL, Colnum);
if (Colp) {
- Colp->InitValue(g); // May not have been done elsewhere
+ // May not have been done elsewhere
+ Colp->InitValue(g);
To_Val = Colp->GetValue();
+
+ // this may be needed by some tables (which?)
+ Colp->SetColUse(ColUse);
} else {
sprintf(g->Message, MSG(NO_MATCHING_COL), Name, tdbp->Tdbp->GetName());
return TRUE;