- Implement putting in memory the result set from an ODBC query.

modified:
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h

- Moving the calls to VerifyConnect and GetConnectInfo into the try block
  in ODBConn::Open (potential crash in case of throw)
modified:
  storage/connect/odbconn.cpp

- Handling all ODBC data date types (91, 92, 93)
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp

- Not assuming string results from ODBC catalog functions are zero terminated
modified:
  storage/connect/odbconn.cpp

1 files changed, 4 insertions, 1 deletions

diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h
index 1dd2aa2c16e..13d58488b39 100644
--- a/storage/connect/odbconn.h
+++ b/storage/connect/odbconn.h
@@ -126,6 +126,7 @@ class ODBConn : public BLOCK {
   int  Open(PSZ ConnectString, DWORD Options = 0);
   bool Rewind(char *sql, ODBCCOL *tocols);
   void Close(void);
+  PQRYRES AllocateResult(PGLOBAL g);
 
   // Attributes
  public:
@@ -187,9 +188,11 @@ class ODBConn : public BLOCK {
   DWORD    m_UpdateOptions;
   DWORD    m_RowsetSize;
   char     m_IDQuoteChar[2];
-  int      m_Catver;
   PSZ      m_Connect;
+  int      m_Catver;
+  int      m_Rows;
   bool     m_Updatable;
   bool     m_Transact;
   bool     m_Scrollable;
+  bool     m_Memory;
   }; // end of ODBConn class definition