- Correct misplaced parenthesis in last change

modified:
  storage/connect/ha_connect.cc

- Tdbp must be assigned before calling PRX column init

modified:
  storage/connect/tabtbl.cpp

storage/connect/ha_connect.cc

@@ -1094,9 +1094,9 @@ PTDB ha_connect::GetTDB(PGLOBAL g)
 
   table_name= GetTableName();
 
-  if (!xp->CheckQuery(valid_query_id && tdbp
+  if (!xp->CheckQuery(valid_query_id) && tdbp
                       && !stricmp(tdbp->GetName(), table_name)
-                      && tdbp->GetMode() == xmod)) {
+                      && tdbp->GetMode() == xmod) {
     tp= tdbp;
     tp->SetMode(xmod);
   } else if ((tp= CntGetTDB(g, table_name, xmod, this)))

storage/connect/tabtbl.cpp

@@ -216,7 +216,6 @@ bool TDBTBL::InitTableList(PGLOBAL g)
   {
   int     n;
   PTABLE  tp, tabp;
-  PTDBASE tdbp;
   PCOL    colp;
   PTBLDEF tdp = (PTBLDEF)To_Def;
 
@@ -227,7 +226,7 @@ bool TDBTBL::InitTableList(PGLOBAL g)
       tabp = new(g) XTAB(tp);
 
       // Get the table description block of this table
-      if (!(tdbp = GetSubTable(g, tabp))) {
+      if (!(Tdbp = GetSubTable(g, tabp))) {
         if (++Nbf > Maxerr)
           return TRUE;               // Error return
         else