diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-20 11:00:02 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-20 11:00:02 +0100 |
commit | c144cf38bd235904f3b4ada2f16327dee7b01d7a (patch) | |
tree | 683ad574ab255d8e3b4aaa95047bf53f64efbda3 /storage/connect/odbconn.h | |
parent | cfa872f6c80e18d440f01ed0cc8f21a94eebd0d9 (diff) | |
download | mariadb-git-c144cf38bd235904f3b4ada2f16327dee7b01d7a.tar.gz |
- 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
Diffstat (limited to 'storage/connect/odbconn.h')
-rw-r--r-- | storage/connect/odbconn.h | 5 |
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 |