- Add the DECIMAL data type (TYPE_DECIM)

  Change the variable name of the DOUBLE type from TYPE_FLOAT to TYPE_DOUBLE
  Change some names to reflect ODBC version 3. This affects some variable
  names, function names and catalog table column names.
  Qualifier -> Catalog
  Owner (Creator) -> Schema
  Length -> Precision
  Prec -> Scale

modified:
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/filamdbf.cpp
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/mysql-test/connect/r/mysql_new.result
  storage/connect/mysql-test/connect/r/odbc_oracle.result
  storage/connect/myutil.cpp
  storage/connect/odbconn.cpp
  storage/connect/plgdbutl.cpp
  storage/connect/rcmsg.c
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabcol.cpp
  storage/connect/tabcol.h
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
  storage/connect/tabsys.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabwmi.cpp
  storage/connect/tabxml.cpp
  storage/connect/valblk.cpp
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xobject.cpp
  storage/connect/xobject.h

- Fix crash when GetTDB returned NULL in Open_Table

modified:
  storage/connect/ha_connect.cc

- Fix assert error setting double values from PSZ

modified:
  storage/connect/valblk.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/storage/connect/tabcol.h b/storage/connect/tabcol.h
index c5ebfdbb10d..fe643e075c3 100644
--- a/storage/connect/tabcol.h
+++ b/storage/connect/tabcol.h
@@ -15,7 +15,7 @@
 /***********************************************************************/
 /*  Definition of class XTAB with all its method functions.            */
 /***********************************************************************/
-class DllExport XTAB: public BLOCK {  // Table Name-Owner-Srcdef block.
+class DllExport XTAB: public BLOCK {  // Table Name-Schema-Srcdef block.
   friend class TDBPRX;
   friend class TDBTBM;
  public:
@@ -28,12 +28,12 @@ class DllExport XTAB: public BLOCK {  // Table Name-Owner-Srcdef block.
   PTDB   GetTo_Tdb(void) {return To_Tdb;}
   LPCSTR GetName(void) {return Name;}
   LPCSTR GetSrc(void) {return Srcdef;}
-  LPCSTR GetCreator(void) {return Creator;}
+  LPCSTR GetSchema(void) {return Schema;}
   LPCSTR GetQualifier(void) {return Qualifier;}
   void   SetTo_Tdb(PTDB tdbp) {To_Tdb = tdbp;}
   void   SetName(LPCSTR name) {Name = name;}
   void   SetSrc(LPCSTR srcdef) {Srcdef = srcdef;}
-  void   SetCreator(LPCSTR crname) {Creator = crname;}
+  void   SetSchema(LPCSTR schname) {Schema = schname;}
   void   SetQualifier(LPCSTR qname) {Qualifier = qname;}
 
   // Methods
@@ -47,7 +47,7 @@ class DllExport XTAB: public BLOCK {  // Table Name-Owner-Srcdef block.
   PTDB      To_Tdb;            // Points to Table description Block
   LPCSTR    Name;              // Table name
   LPCSTR    Srcdef;            // Table Source definition
-  LPCSTR    Creator;           // Creator name
+  LPCSTR    Schema;            // Schema name
   LPCSTR    Qualifier;         // Qualifier name
   }; // end of class XTAB
 
@@ -68,7 +68,7 @@ class DllExport COLUMN: public XOBJECT {  // Column Name/Qualifier block.
   virtual int    GetResultType(void) {assert(false); return TYPE_VOID;}
   virtual int    GetLength(void) {assert(false); return 0;}
   virtual int    GetLengthEx(void) {assert(false); return 0;}
-  virtual int    GetPrecision() {assert(false); return 0;};
+  virtual int    GetScale() {assert(false); return 0;};
           LPCSTR GetName(void) {return Name;}
           LPCSTR GetQualifier(void) {return Qualifier;}
           PTABLE GetTo_Table(void) {return To_Table;}