diff options
Diffstat (limited to 'storage/connect/odbconn.h')
| -rw-r--r-- | storage/connect/odbconn.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h index 1dd2aa2c16e..dfdb9fe7f56 100644 --- a/storage/connect/odbconn.h +++ b/storage/connect/odbconn.h @@ -33,10 +33,6 @@ typedef unsigned char *PUCHAR; #endif // !WIN32 -// Timeout and net wait defaults -#define DEFAULT_LOGIN_TIMEOUT 15 // seconds to before fail on connect -#define DEFAULT_QUERY_TIMEOUT 15 // seconds to before fail waiting for results - // Field Flags, used to indicate status of fields //efine SQL_FIELD_FLAG_DIRTY 0x1 //efine SQL_FIELD_FLAG_NULL 0x2 @@ -124,8 +120,9 @@ class ODBConn : public BLOCK { forceOdbcDialog = 0x0010}; // Always display ODBC connect dialog int Open(PSZ ConnectString, DWORD Options = 0); - bool Rewind(char *sql, ODBCCOL *tocols); + int Rewind(char *sql, ODBCCOL *tocols); void Close(void); + PQRYRES AllocateResult(PGLOBAL g); // Attributes public: @@ -187,9 +184,12 @@ 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_First; + bool m_Full; }; // end of ODBConn class definition |