diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-19 16:41:25 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-04-19 16:41:25 +0200 |
| commit | 50953a0e9de6ae36a62fc195f3fc97d6d319493e (patch) | |
| tree | 33689c716390d4e5f3abf302937322baaae3cf04 /storage/connect/ha_connect.h | |
| parent | 812520315318e358d2d9daf9ca709578af1efe40 (diff) | |
| parent | 213ecbbb4f3d252ba2d653eacf756e123821c41a (diff) | |
| download | mariadb-git-50953a0e9de6ae36a62fc195f3fc97d6d319493e.tar.gz | |
- Commit merge files
modified:
storage/connect/catalog.h
storage/connect/filamvct.cpp
storage/connect/filamzip.cpp
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mycat.cc
storage/connect/mycat.h
storage/connect/myconn.cpp
storage/connect/mysql-test/connect/r/xml.result
storage/connect/plgdbutl.cpp
storage/connect/reldef.cpp
storage/connect/reldef.h
storage/connect/tabdos.cpp
storage/connect/tabfmt.cpp
storage/connect/tabmul.cpp
storage/connect/tabmysql.cpp
storage/connect/taboccur.cpp
storage/connect/tabodbc.cpp
storage/connect/tabpivot.cpp
storage/connect/tabpivot.h
storage/connect/tabsys.cpp
storage/connect/tabtbl.cpp
storage/connect/tabutil.cpp
storage/connect/tabvct.cpp
storage/connect/tabwmi.cpp
storage/connect/tabxcl.cpp
storage/connect/tabxml.cpp
storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/ha_connect.h')
| -rw-r--r-- | storage/connect/ha_connect.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h index 46763394945..fac7560ddd6 100644 --- a/storage/connect/ha_connect.h +++ b/storage/connect/ha_connect.h @@ -180,7 +180,7 @@ public: // CONNECT Implementation static bool connect_init(void); static bool connect_end(void); - TABTYPE GetRealType(PTOS pos); + TABTYPE GetRealType(PTOS pos= NULL); char *GetStringOption(char *opname, char *sdef= NULL); PTOS GetTableOptionStruct(TABLE *table_arg); bool GetBooleanOption(char *opname, bool bdef); @@ -256,8 +256,8 @@ public: */ ulong index_flags(uint inx, uint part, bool all_parts) const { - return HA_READ_NEXT | HA_READ_RANGE | HA_READ_ORDER - | HA_KEYREAD_ONLY | HA_KEY_SCAN_NOT_ROR; + return HA_READ_NEXT | HA_READ_RANGE | HA_READ_ORDER | + HA_READ_PREV | HA_KEYREAD_ONLY | HA_KEY_SCAN_NOT_ROR; } // end of index_flags /** @brief @@ -421,7 +421,7 @@ PFIL CondFilter(PGLOBAL g, Item *cond); We implement this in ha_connect.cc. It's not an obligatory method; skip it and and MySQL will treat it as not implemented. */ -//int index_prev(uchar *buf); +int index_prev(uchar *buf); /** @brief We implement this in ha_connect.cc. It's not an obligatory method; |