diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-15 18:28:24 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-11-15 18:28:24 +0100 |
commit | 5d8311960a8f993591075b3da6106559922183b4 (patch) | |
tree | 1efe45e1188606c895a4069c05a2501826e1f293 /storage/connect/odbconn.h | |
parent | 9ade2d088d12f6a2a6f901148ed72a45dd15e9ff (diff) | |
download | mariadb-git-5d8311960a8f993591075b3da6106559922183b4.tar.gz |
- Implement the NEWMSG and XMSG methods
They are still experimental and should not be used in production.
added:
storage/connect/encas.h
storage/connect/english.msg
storage/connect/enids.h
storage/connect/frcas.h
storage/connect/french.msg
storage/connect/frids.h
storage/connect/frmsg.h
modified:
storage/connect/connect.cc
storage/connect/engmsg.h
storage/connect/filamdbf.cpp
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/msgid.h
storage/connect/plgdbutl.cpp
storage/connect/plugutil.c
storage/connect/rcmsg.c
storage/connect/resource.h
storage/connect/tabfmt.h
- Fix global variable not being properly initialized (MDEV-6690, MDEV-7094)
modified:
storage/connect/ha_connect.cc
storage/connect/plugutil.c
storage/connect/user_connect.cc
storage/connect/xindex.cpp
- Implement Rewind for ODBC tables (MDEV-7097)
modified:
storage/connect/odbconn.cpp
storage/connect/odbconn.h
storage/connect/tabmysql.cpp
storage/connect/tabodbc.cpp
- Reset N when reopening MYSQL tables
modified:
storage/connect/tabmysql.cpp
Diffstat (limited to 'storage/connect/odbconn.h')
-rw-r--r-- | storage/connect/odbconn.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h index 90d116cb1ad..1dd2aa2c16e 100644 --- a/storage/connect/odbconn.h +++ b/storage/connect/odbconn.h @@ -95,7 +95,7 @@ class DBX : public BLOCK { const char *GetErrorMessage(int i); protected: - void BuildErrorMessage(ODBConn* pdb, HSTMT hstmt = SQL_NULL_HSTMT); + bool BuildErrorMessage(ODBConn* pdb, HSTMT hstmt = SQL_NULL_HSTMT); // Attributes RETCODE m_RC; @@ -124,6 +124,7 @@ class ODBConn : public BLOCK { forceOdbcDialog = 0x0010}; // Always display ODBC connect dialog int Open(PSZ ConnectString, DWORD Options = 0); + bool Rewind(char *sql, ODBCCOL *tocols); void Close(void); // Attributes @@ -190,4 +191,5 @@ class ODBConn : public BLOCK { PSZ m_Connect; bool m_Updatable; bool m_Transact; + bool m_Scrollable; }; // end of ODBConn class definition |