- NOTE: an experimental implementation of MRR was done but not kept

  in this version. Sure enough, it never caused any improvement in
  the execution speed and rather caused a small increase of execution
  time. This is probably because values are sorted by rowid in each
  range of CONNECT indexes. This could be reconsidered if a customer
  have a need for processing very big files.

- Fix a bug in ha_connect::CheckCond. The negated form of BETWEEN and
  IS NULL operators was not recognized.
modified:
  storage/connect/ha_connect.cc

- Add long jump initialization in CntReadNext. This was causing a server
  crash when an error occured in a ReadColumn.
modified:
  storage/connect/connect.cc

- General cleanup of CONNECT source code eliminating all code not used by
  CONNECT, including the MRR test code (saved separately).
modified:
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/domdoc.h
  storage/connect/filamap.cpp
  storage/connect/filamap.h
  storage/connect/filamdbf.h
  storage/connect/filamfix.cpp
  storage/connect/filamfix.h
  storage/connect/filamtxt.cpp
  storage/connect/filamtxt.h
  storage/connect/filamvct.cpp
  storage/connect/filamvct.h
  storage/connect/filamzip.cpp
  storage/connect/filamzip.h
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/myconn.h
  storage/connect/plgcnx.h
  storage/connect/plgdbsem.h
  storage/connect/plugutil.c
  storage/connect/preparse.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabcol.h
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfix.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabfmt.h
  storage/connect/table.cpp
  storage/connect/tabmac.h
  storage/connect/tabmul.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/taboccur.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  storage/connect/tabsys.cpp
  storage/connect/tabsys.h
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/tabutil.h
  storage/connect/tabvct.cpp
  storage/connect/tabvct.h
  storage/connect/tabwmi.cpp
  storage/connect/tabwmi.h
  storage/connect/tabxml.cpp
  storage/connect/tabxml.h
  storage/connect/user_connect.cc
  storage/connect/user_connect.h
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xobject.cpp
  storage/connect/xobject.h
  storage/connect/xtable.h

1 files changed, 0 insertions, 140 deletions

diff --git a/storage/connect/plgcnx.h b/storage/connect/plgcnx.h
index fe3997d1986..a1208f9b885 100644
--- a/storage/connect/plgcnx.h
+++ b/storage/connect/plgcnx.h
@@ -62,146 +62,6 @@ enum INFO {INDX_RC,                  /* Index of PlugDB return code field */
            INDX_SIZE,                /* Index of returned data size field */
            INDX_MAX};                /* Size of info array                */
 
-#ifdef NOT_USED
-/**************************************************************************/
-/*  Internal message types.                                               */
-/**************************************************************************/
-enum MSGTYP {MST_OPEN      = 10,     /* Code for old connecting message   */
-             MST_COMMAND   = 11,     /* Code for send command message     */
-             MST_RESULT    = 12,     /* Code for get result message       */
-             MST_CLOSE     = 13,     /* Code for disconnecting message    */
-             MST_PROGRESS  = 14,     /* Code for progress message         */
-             MST_CANCEL    = 15,     /* Code for cancel message           */
-             MST_PROCESSED = 16,     /* Code for already processed msg    */
-             MST_ERROR     = 17,     /* Code for get error message        */
-             MST_CHAR      = 18,     /* Code for get char value message   */
-             MST_LONG      = 19,     /* Code for get int value message   */
-             MST_COLUMN    = 20,     /* Code for get col  value message   */
-             MST_MESSAGE   = 21,     /* Code for get message    message   */
-             MST_HEADER    = 22,     /* Code for get header     message   */
-             MST_SOCKET    = 23,     /* Code for socket error   message   */
-             MST_SHUTDOWN  = 24,     /* Code for shutdown       message   */
-             MST_SOCKPROG  = 25,     /* Code for socket progress message  */
-             MST_POST      = 26,     /* Code for post command message     */
-             MST_NEW_OPEN  = 27,     /* Code for new connecting message   */
-             MST_PROG_NUM  =  5};    /* Num of integers in progress msg   */
-
-/**************************************************************************/
-/*  Vendors.                                                              */
-/**************************************************************************/
-enum VENDOR {VDR_UNKNOWN   = -2,     /* Not known or not connected        */
-             VDR_PlugDB    = -1,     /* PlugDB                           */
-             VDR_OTHER     =  0};    /* OEM                               */
-
-/**************************************************************************/
-/*  Attribute keys of Result Description structure (arranged by type).    */
-/**************************************************************************/
-enum CKEYS {K_ProgMsg, K_Lang, K_ActiveDB, K_Cmax};
-enum LKEYS {K_NBcol, K_NBlin, K_CurPos, K_RC, K_Result, K_Elapsed,
-            K_Continued, K_Maxsize, K_Affrows, K_Lmax, K_Maxcol,
-            K_Maxres, K_Maxlin, K_NBparm};
-enum NKEYS {K_Type, K_Length, K_Prec, K_DataLen, K_Unsigned, K_Nmax};
-
-/**************************************************************************/
-/*  Result description structures.                                        */
-/**************************************************************************/
-typedef struct _MsgTagAttr {
-  bool   fSupplied;
-  char   Attr[MAXMESSAGE];
-  } MTAG, *PMTAG;
-
-typedef struct _CharTagAttr {
-  bool   fSupplied;
-  char   Attr[MAXDBNAME];
-  } CTAG, *PCTAG;
-
-typedef struct _LongTagAttr {
-  bool   fSupplied;
-  int   Attr;
-  } LTAG, *PLTAG;
-
-typedef struct _ColVar {
-  LTAG   Lat[K_Nmax];
-  CTAG   Cat;
-  } COLVAR, *LPCOLVAR;
-
-typedef struct _ResDesc {
-  int   Maxcol;                                 /* Max number of columns */
-  int   Colnum;                                 /* Number of columns     */
-  MTAG   Mat;                                    /* Message               */
-  CTAG   Cat[K_Cmax];                            /* Character attributes  */
-  LTAG   Lat[K_Lmax];                            /* Long int  attributes  */
-  COLVAR Col[1];                                 /* Column    attributes  */
-  } RDESC, *PRDESC;
-
-/**************************************************************************/
-/*  Exported PlugDB client functions in Plgcnx DLL.                       */
-/**************************************************************************/
-#if !defined(CNXFUNC)
-#if defined(UNIX) || defined(UNIV_LINUX)
-#undef __stdcall
-#define __stdcall
-#endif
-
-#if defined(NOLIB)                         /* Dynamic link of plgcnx.dll  */
-#define CNXFUNC(f)    (__stdcall *f)
-#else      /* LIB */                       /* Static link with plgcnx.lib */
-#define CNXFUNC(f)    __stdcall f
-#endif
-#endif
-
-#if !defined(CNXKEY)
-#define CNXKEY         uint
-#endif
-
-#if !defined(XTRN)
-#define XTRN
-#endif
-
-//#if !defined(NO_FUNC)
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-XTRN int CNXFUNC(PLGConnect)     (CNXKEY *, const char *, bool);
-XTRN int CNXFUNC(PLGSendCommand) (CNXKEY, const char *, void *, int, int *);
-XTRN int CNXFUNC(PLGGetResult)   (CNXKEY, void *, int, int *, bool);
-XTRN int CNXFUNC(PLGDisconnect)  (CNXKEY);
-XTRN int CNXFUNC(PLGGetErrorMsg) (CNXKEY, char *, int, int *);
-XTRN bool CNXFUNC(PLGGetCharValue)(CNXKEY, char *, int, int);
-XTRN bool CNXFUNC(PLGGetIntValue)(CNXKEY, int *, int);
-XTRN bool CNXFUNC(PLGGetColValue) (CNXKEY, int *, int, int);
-XTRN bool CNXFUNC(PLGGetMessage)  (CNXKEY, char *, int);
-XTRN bool CNXFUNC(PLGGetHeader)   (CNXKEY, char *, int, int, int);
-
-#ifdef __cplusplus
-}
-#endif
-//#endif /* !NO_FUNC */
-
-/**************************************************************************/
-/*  Convenience function Definitions                                      */
-/**************************************************************************/
-#define PLGPostCommand(T,C)    PLGSendCommand(T,C,NULL,0,NULL)
-#if defined(FNCMAC)
-#define PLGGetProgMsg(T,C,S)   PLGGetCharValue(T,C,S,K_ProgMsg)
-#define PLGGetLangID(T,C,S)    PLGGetCharValue(T,C,S,K_Lang)
-#define PLGGetActiveDB(T,C,S)  PLGGetCharValue(T,C,S,K_ActiveDB)
-#define PLGGetCursorPos(T,L)   PLGGetIntValue(T,L,K_CurPos)
-#define PLGGetResultType(T,L)  PLGGetIntValue(T,L,K_Result)
-#define PLGGetNBcol(T,L)       PLGGetIntValue(T,L,K_NBcol)
-#define PLGGetNBlin(T,L)       PLGGetIntValue(T,L,K_NBlin)
-#define PLGGetRetCode(T,L)     PLGGetIntValue(T,L,K_RC)
-#define PLGGetElapsed(T,L)     PLGGetIntValue(T,L,K_Elapsed)
-#define PLGGetContinued(T,L)   PLGGetIntValue(T,L,K_Continued)
-#define PLGGetMaxSize(T,L)     PLGGetIntValue(T,L,K_Maxsize)
-#define PLGGetLength(T,L,C)    PLGGetColValue(T,L,K_Length,C)
-#define PLGGetDataSize(T,L,C)  PLGGetColValue(T,L,K_DataLen,C)
-#define PLGGetDecimal(T,L,C)   PLGGetColValue(T,L,K_Prec,C)
-#define PLGGetType(T,L,C)      PLGGetColValue(T,L,K_Type,C)
-#endif  /* FNCMAC */
-#endif // NOT_USED
-
 #endif  /* !_PLGCNX_H */
 
 /* ------------------------- End of Plgcnx.h ---------------------------- */