- Implement the SERVID special columns. This imply modifying the way

  special columns are processed. This will be documented.
  Also some code cleanup and some changes to prepare the indexing of
  nullable columns (not achieve yet)

modified:
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/macutil.cpp
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.h
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.h
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xtable.h

1 files changed, 10 insertions, 8 deletions

diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc
index e0c722bc01f..2f7ec8299df 100644
--- a/storage/connect/connect.cc
+++ b/storage/connect/connect.cc
@@ -239,7 +239,7 @@ bool CntOpenTable(PGLOBAL g, PTDB tdbp, MODE mode, char *c1, char *c2,
   char   *p;
   int     i, n;
   PCOL    colp;
-  PCOLUMN cp;
+//PCOLUMN cp;
   PDBUSER dup= PlgGetUser(g);
 
   if (xtrace)
@@ -251,6 +251,8 @@ bool CntOpenTable(PGLOBAL g, PTDB tdbp, MODE mode, char *c1, char *c2,
     return true;
     } // endif tdbp
 
+  tdbp->SetMode(mode);
+
   if (!c1) {
     if (mode == MODE_INSERT)
       // Allocate all column blocks for that table
@@ -261,12 +263,12 @@ bool CntOpenTable(PGLOBAL g, PTDB tdbp, MODE mode, char *c1, char *c2,
     if (xtrace)
       printf("Allocating column %s\n", p);
 
-    if (*p == '*') {
-      // This is a special column
-      cp= new(g) COLUMN(p + 1);
-      cp->SetTo_Table(tdbp->GetTable());
-      colp= ((PTDBASE)tdbp)->InsertSpcBlk(g, cp);
-    } else
+//    if (*p == '*') {
+//      // This is a special column
+//      cp= new(g) COLUMN(p + 1);
+//      cp->SetTo_Table(tdbp->GetTable());
+//      colp= ((PTDBASE)tdbp)->InsertSpcBlk(g, cp);
+//    } else
       colp= tdbp->ColDB(g, p, 0);
 
     if (!colp) {
@@ -330,7 +332,7 @@ bool CntOpenTable(PGLOBAL g, PTDB tdbp, MODE mode, char *c1, char *c2,
     printf("Opening table %s in mode %d tdbp=%p\n",
            tdbp->GetName(), mode, tdbp);
 
-  tdbp->SetMode(mode);
+//tdbp->SetMode(mode);
 
   if (del && ((PTDBASE)tdbp)->GetFtype() != RECFM_NAF) {  
     // To avoid erasing the table when doing a partial delete