diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-28 23:01:55 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-28 23:01:55 +0100 |
| commit | d862d7c049f95575242164341605b7e69d71e427 (patch) | |
| tree | d6cebd444750355e66b1b199e6ff954c01bfef26 /storage/connect/tabodbc.h | |
| parent | aa107ef3ab47c9bfbd177672e64d2af56ce1b1b5 (diff) | |
| download | mariadb-git-d862d7c049f95575242164341605b7e69d71e427.tar.gz | |
- Implement random access to ODBC tables
modified:
storage/connect/odbconn.cpp
storage/connect/odbconn.h
- Fix get proper length of ODBC DECIMAL column in discovery
modified:
storage/connect/ha_connect.cc
storage/connect/mysql-test/connect/r/odbc_oracle.result
- Implement random access to JSON tables
modified:
storage/connect/tabjson.cpp
storage/connect/tabjson.h
- Fix MDEV-7636
modified:
storage/connect/tabutil.cpp
Diffstat (limited to 'storage/connect/tabodbc.h')
| -rw-r--r-- | storage/connect/tabodbc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/connect/tabodbc.h b/storage/connect/tabodbc.h index eb20eb6efde..b8c9d85aae5 100644 --- a/storage/connect/tabodbc.h +++ b/storage/connect/tabodbc.h @@ -64,8 +64,8 @@ class DllExport ODBCDEF : public TABDEF { /* Logical table description */ int Quoted; /* Identifier quoting level */ int Maxerr; /* Maxerr for an Exec table */ int Maxres; /* Maxres for a catalog table */ + int Memory; /* Put result set in memory */ bool Scrollable; /* Use scrollable cursor */ - bool Memory; /* Put result set in memory */ bool Xsrc; /* Execution type */ bool UseCnc; /* Use SQLConnect (!SQLDriverConnect) */ }; // end of ODBCDEF @@ -93,6 +93,7 @@ class TDBODBC : public TDBASE { // Methods virtual PTDB CopyOne(PTABS t); virtual int GetRecpos(void); + virtual bool SetRecpos(PGLOBAL g, int recpos); virtual PSZ GetFile(PGLOBAL g); virtual void SetFile(PGLOBAL g, PSZ fn); virtual void ResetSize(void); @@ -148,6 +149,7 @@ class TDBODBC : public TDBASE { int Qto; // Query timeout int Quoted; // The identifier quoting level int Fpos; // Position of last read record + int Curpos; // Cursor position of last fetch int AftRows; // The number of affected rows int Rows; // Rowset size int Catver; // Catalog ODBC version @@ -157,6 +159,7 @@ class TDBODBC : public TDBASE { int Nparm; // The number of statement parameters int Memory; // 0: No 1: Alloc 2: Put 3: Get bool Scrollable; // Use scrollable cursor + bool Placed; // True for position reading bool UseCnc; // Use SQLConnect (!SQLDriverConnect) PQRYRES Qrp; // Points to storage result }; // end of class TDBODBC |