- Extending connect_assisted_discovery column automatic definition

  to OCCUR and PIVOT table types.

modified:
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/myconn.h
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h

- Fix wrong definition of GetVlen for TYPE template

modified:
  storage/connect/valblk.h

1 files changed, 2 insertions, 1 deletions

diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h
index a7b1b5046d7..d9286b72f9f 100644
--- a/storage/connect/valblk.h
+++ b/storage/connect/valblk.h
@@ -36,6 +36,7 @@ class VALBLK : public BLOCK {
           void  *GetValPointer(void) {return Blkp;}
           void   SetValPointer(void *mp) {Blkp = mp;}
           int    GetType(void) {return Type;}
+          int    GetPrec(void) {return Prec;}
           void   SetCheck(bool b) {Check = b;}
           void   MoveNull(int i, int j)
                   {if (To_Nulls) To_Nulls[j] = To_Nulls[j];}
@@ -110,7 +111,7 @@ class TYPBLK : public VALBLK {
 
   // Implementation
   virtual void   Init(PGLOBAL g, bool check);
-  virtual int    GetVlen(void) {return sizeof(int);}
+  virtual int    GetVlen(void) {return sizeof(TYPE);}
 //virtual PSZ    GetCharValue(int n);
   virtual short  GetShortValue(int n) {return (short)Typp[n];}
   virtual int    GetIntValue(int n) {return (int)Typp[n];}