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

diff --git a/storage/connect/reldef.h b/storage/connect/reldef.h
index e443374b676..a877c8ee915 100644
--- a/storage/connect/reldef.h
+++ b/storage/connect/reldef.h
@@ -87,7 +87,7 @@ class DllExport TABDEF : public RELDEF {   /* Logical table descriptor */
 
  protected:
   // Members
-  PSZ     Owner;                /* Table owner (for ODBC)              */
+  PSZ     Schema;               /* Table schema (for ODBC)             */
   PSZ     Desc;                 /* Table description                   */
   uint    Catfunc;              /* Catalog function ID                 */
   int     Card;                 /* (max) number of rows in table       */
@@ -149,6 +149,7 @@ class DllExport COLCRT : public BLOCK { /* Column description block
   PSZ  GetFmt(void) {return Fmt;}
   int  GetOpt(void) {return Opt;}
   int  GetLong(void) {return Long;}
+  int  GetPrecision(void) {return Precision;}
   int  GetOffset(void) {return Offset;}
   void SetOffset(int offset) {Offset = offset;}
 
@@ -161,7 +162,8 @@ class DllExport COLCRT : public BLOCK { /* Column description block
   int     Offset;             /* Offset of field within record         */
   int     Long;               /* Length of field in file record (!BIN) */
   int     Key;                /* Key (greater than 1 if multiple)      */
-  int     Prec;               /* Precision for float values            */
+  int     Precision;          /* Logical column length                 */
+  int     Scale;              /* Decimals for float/decimal values     */
   int     Opt;                /* 0:Not 1:clustered 2:sorted-asc 3:desc */
   char    DataType;           /* Internal data type (C, N, F, T)       */
   }; // end of COLCRT