- 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, 2 insertions, 17 deletions

diff --git a/storage/connect/connect.h b/storage/connect/connect.h
index e81e54776c9..4b3e2fb7347 100644
--- a/storage/connect/connect.h
+++ b/storage/connect/connect.h
@@ -47,20 +47,9 @@ int   CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
 PGLOBAL CntExit(PGLOBAL g);
 
 /***********************************************************************/
-/*  Definition of classes XCOLCRT, XIXDEF, XKPDEF, DOXDEF, TDBDOX      */
+/*  Definition of classes XKPDEF, DOXDEF, TDBDOX                       */
 /*  These classes purpose is chiefly to access protected items!        */
 /***********************************************************************/
-class XCOLCRT: public COLCRT {
-  friend class ha_connect;
-  friend bool CntCreateTable(PGLOBAL, char *, PCXF);
- public:
-  XCOLCRT(PSZ name) : COLCRT(name) {Nulls= -1;}        // Constructor
-  bool HasNulls(void) {return (Nulls != 0);}
-
-private:
-  int Nulls;
-  }; // end of class XCOLCRT
-
 class DOXDEF: public DOSDEF {
 //friend class TDBDOX;
 //friend int MakeIndex(PGLOBAL, PTDB, PIXDEF);
@@ -87,11 +76,7 @@ class XKPDEF: public KPARTDEF {
 //friend int CntMakeIndex(PGLOBAL, const char *, PIXDEF);
   friend int CntIndexInit(PGLOBAL, PTDB, int);
  public:
-  XKPDEF(const char *name, int n) : KPARTDEF((PSZ)name, n) {HasNulls= false;}
-  void   SetNulls(bool b) {HasNulls= b;}
-
- protected:
-  bool   HasNulls;            /* Can have null values                  */
+  XKPDEF(const char *name, int n) : KPARTDEF((PSZ)name, n) {}
   }; // end of class XKPDEF
 
 //RCODE CheckRecord(PGLOBAL g, PTDB tdbp, char *oldbuf, char *newbuf);