- Implement "remote" index (similar to FEDERATED ones) for MYSQL tables.

  Not yet done for ODBC tables.
modified:
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/reldef.h
  storage/connect/tabdos.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  storage/connect/xindex.cpp
  storage/connect/xtable.h

- Return error in "info" on Cardinality error.
modified:
  storage/connect/ha_connect.cc

1 files changed, 3 insertions, 3 deletions

diff --git a/storage/connect/tabdos.h b/storage/connect/tabdos.h
index a213dd142bf..5ea7847d2c9 100644
--- a/storage/connect/tabdos.h
+++ b/storage/connect/tabdos.h
@@ -49,7 +49,7 @@ class DllExport DOSDEF : public TABDEF {  /* Logical table description */
   int     GetEnding(void) {return Ending;}
 
   // Methods
-  virtual bool Indexable(void) {return Compressed != 1;}
+  virtual int  Indexable(void) {return (Compressed != 1) ? 1 : 0;}
   virtual bool DeleteIndexFile(PGLOBAL g, PIXDEF pxdf);
   virtual bool DefineAM(PGLOBAL g, LPCSTR am, int poff);
   virtual PTDB GetTable(PGLOBAL g, MODE mode);
@@ -146,10 +146,10 @@ class DllExport TDBDOS : public TDBASE {
   virtual int   ReadBuffer(PGLOBAL g) {return Txfp->ReadBuffer(g);}
 
   // Specific routine
-  virtual int  EstimatedLength(PGLOBAL g);
+  virtual int   EstimatedLength(PGLOBAL g);
 
   // Optimization routines
-          int   MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add);
+  virtual int   MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add);
 
  protected:
   // Members