- 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, 1 deletions

diff --git a/storage/connect/colblk.h b/storage/connect/colblk.h
index 7b5fe0cad0f..320350f1923 100644
--- a/storage/connect/colblk.h
+++ b/storage/connect/colblk.h
@@ -29,7 +29,8 @@ class DllExport COLBLK : public XOBJECT {
   // Implementation
   virtual int     GetType(void) {return TYPE_COLBLK;}
   virtual int     GetResultType(void) {return Buf_Type;}
-  virtual int     GetPrecision(void) {return Format.Prec;}
+  virtual int     GetScale(void) {return Format.Prec;}
+  virtual int     GetPrecision(void) {return Precision;}
   virtual int     GetLength(void) {return Long;}
   virtual int     GetLengthEx(void);
   virtual int     GetAmType() {return TYPE_AM_ERROR;}
@@ -53,6 +54,7 @@ class DllExport COLBLK : public XOBJECT {
           PSZ     GetDomain(void) {return (Cdp) ? Cdp->Decode : NULL;}
           PSZ     GetDesc(void) {return (Cdp) ? Cdp->Desc : NULL;}
           PSZ     GetFmt(void) {return (Cdp) ? Cdp->Fmt : NULL;}
+          bool    IsUnsigned(void) {return Unsigned;}
           bool    IsNullable(void) {return Nullable;}
           void    SetNullable(bool b) {Nullable = b;}
                   
@@ -88,6 +90,7 @@ class DllExport COLBLK : public XOBJECT {
   int     Opt;                 // Cluster/sort information
   int     Buf_Type;            // Data type
   int     Long;                // Internal length in table
+  int     Precision;           // Column length (as for ODBC)
   FORMAT  Format;              // Output format
   ushort  ColUse;              // Column usage
   ushort  Status;              // Column read status