diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-07-18 22:40:15 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-07-18 22:40:15 +0400 |
| commit | 79c4b4e44008a3ba1ba9a5c947a0ffea6a6b54a2 (patch) | |
| tree | 4c662dad4bebdd7a56ad550009af5bb05924f5fe /storage/maria/ha_maria.h | |
| parent | 33e961c1abbf7d401a6f3ae5c04ff312b433ca3a (diff) | |
| parent | 7e6bec87c18c13f2f3d2d1405828236a728316ce (diff) | |
| download | mariadb-git-79c4b4e44008a3ba1ba9a5c947a0ffea6a6b54a2.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'storage/maria/ha_maria.h')
| -rw-r--r-- | storage/maria/ha_maria.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 35c98cc52d7..545daca12fe 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -65,12 +65,7 @@ public: const char **bas_ext() const; ulonglong table_flags() const { return int_table_flags; } - ulong index_flags(uint inx, uint part, bool all_parts) const - { - return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_FULLTEXT) ? - 0 : HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE | - HA_READ_ORDER | HA_KEYREAD_ONLY | HA_DO_INDEX_COND_PUSHDOWN); - } + ulong index_flags(uint inx, uint part, bool all_parts) const; uint max_supported_keys() const { return MARIA_MAX_KEY; } uint max_supported_key_length() const; |